gavindiaz/mql5
1
0
Fork 0
mirror of https://github.com/softwaredevelop/mql5.git synced 2026-08-13 20:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Uses MovingAverage_Engine & ATR Engine

Browse Source
This commit is contained in:
Toh4iem9
2025-12-20 12:19:04 +01:00
parent b13fe0512d
commit 422dccee5d
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Include/MyIncludes/KeltnerChannel_Calculator.mqh
+9 -11
View File
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| KeltnerChannel_Calculator.mqh| //| KeltnerChannel_Calculator.mqh|
//| VERSION 2.01: Fixed enum definition visibility. | //| VERSION 3.00: Uses MovingAverage_Engine & ATR Engine. |
//| Copyright 2025, xxxxxxxx | //| Copyright 2025, xxxxxxxx |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx" #property copyright "Copyright 2025, xxxxxxxx"
@@ -36,7 +36,8 @@ public:
CKeltnerChannelCalculator(void); CKeltnerChannelCalculator(void);
virtual ~CKeltnerChannelCalculator(void); virtual ~CKeltnerChannelCalculator(void);
bool Init(int ma_p, ENUM_MA_METHOD ma_m, int atr_p, double mult, ENUM_ATR_SOURCE atr_src); //--- Init now takes ENUM_MA_TYPE
bool Init(int ma_p, ENUM_MA_TYPE ma_m, int atr_p, double mult, ENUM_ATR_SOURCE atr_src);
void Calculate(int rates_total, int prev_calculated, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type, void Calculate(int rates_total, int prev_calculated, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type,
double &middle_buffer[], double &upper_buffer[], double &lower_buffer[]); double &middle_buffer[], double &upper_buffer[], double &lower_buffer[]);
@@ -73,24 +74,20 @@ void CKeltnerChannelCalculator::CreateCalculators(void)
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| Init | //| Init |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
bool CKeltnerChannelCalculator::Init(int ma_p, ENUM_MA_METHOD ma_m, int atr_p, double mult, ENUM_ATR_SOURCE atr_src) bool CKeltnerChannelCalculator::Init(int ma_p, ENUM_MA_TYPE ma_m, int atr_p, double mult, ENUM_ATR_SOURCE atr_src)
{ {
m_multiplier = (mult <= 0) ? 2.0 : mult; m_multiplier = (mult <= 0) ? 2.0 : mult;
// Create MA Calculator // Create MA Calculator (Virtual call handles HA override)
CreateCalculators(); CreateCalculators();
// Create ATR Calculator based on source selection // Create ATR Calculator based on source selection
// Note: CATRCalculator_HA is defined in ATR_Calculator.mqh?
// No, usually in the same file or we need to ensure visibility.
// Assuming ATR_Calculator.mqh contains both classes.
if(atr_src == ATR_SOURCE_HEIKIN_ASHI) if(atr_src == ATR_SOURCE_HEIKIN_ASHI)
m_atr_calc = new CATRCalculator_HA(); m_atr_calc = new CATRCalculator_HA();
else else
m_atr_calc = new CATRCalculator(); m_atr_calc = new CATRCalculator();
if(CheckPointer(m_ma_calc) == POINTER_INVALID || !m_ma_calc.Init(ma_p, (ENUM_MA_TYPE)ma_m)) if(CheckPointer(m_ma_calc) == POINTER_INVALID || !m_ma_calc.Init(ma_p, ma_m))
return false; return false;
if(CheckPointer(m_atr_calc) == POINTER_INVALID || !m_atr_calc.Init(atr_p, ATR_POINTS)) if(CheckPointer(m_atr_calc) == POINTER_INVALID || !m_atr_calc.Init(atr_p, ATR_POINTS))
@@ -116,7 +113,6 @@ void CKeltnerChannelCalculator::Calculate(int rates_total, int prev_calculated,
m_ma_calc.Calculate(rates_total, prev_calculated, price_type, open, high, low, close, middle_buffer); m_ma_calc.Calculate(rates_total, prev_calculated, price_type, open, high, low, close, middle_buffer);
//--- 2. Calculate ATR - Incremental //--- 2. Calculate ATR - Incremental
// Note: ATR engine ignores price_type for TR calculation (uses High/Low/Close)
m_atr_calc.Calculate(rates_total, prev_calculated, open, high, low, close, m_atr_buffer); m_atr_calc.Calculate(rates_total, prev_calculated, open, high, low, close, m_atr_buffer);
//--- 3. Calculate Bands - Incremental Loop //--- 3. Calculate Bands - Incremental Loop
@@ -130,7 +126,9 @@ void CKeltnerChannelCalculator::Calculate(int rates_total, int prev_calculated,
for(int i = loop_start; i < rates_total; i++) for(int i = loop_start; i < rates_total; i++)
{ {
if(middle_buffer[i] != EMPTY_VALUE && m_atr_buffer[i] != EMPTY_VALUE) // Ensure both components are valid
if(middle_buffer[i] != 0.0 && middle_buffer[i] != EMPTY_VALUE &&
m_atr_buffer[i] != 0.0 && m_atr_buffer[i] != EMPTY_VALUE)
{ {
upper_buffer[i] = middle_buffer[i] + (m_atr_buffer[i] * m_multiplier); upper_buffer[i] = middle_buffer[i] + (m_atr_buffer[i] * m_multiplier);
lower_buffer[i] = middle_buffer[i] - (m_atr_buffer[i] * m_multiplier); lower_buffer[i] = middle_buffer[i] - (m_atr_buffer[i] * m_multiplier);