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

refactor: Heikin Ashi logic

Browse Source
This commit is contained in:
Toh4iem9
2025-10-20 14:58:13 +02:00
parent ac60816326
commit 62fe2762b9
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Include/MyIncludes/Session_Analysis_Calculator.mqh
+17 -1
View File
@@ -27,10 +27,13 @@ protected:
double m_src_high[], m_src_low[], m_src_price[]; double m_src_high[], m_src_low[], m_src_price[];
bool IsTimeInSession(const MqlDateTime &dt); bool IsTimeInSession(const MqlDateTime &dt);
// RE-INTRODUCED: Made virtual to allow overriding for Heikin Ashi
virtual bool PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type); virtual bool PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type);
void DrawSession(int start_bar, int end_bar, long session_id, const datetime &time[]); void DrawSession(int start_bar, int end_bar, long session_id, const datetime &time[]);
public: public:
CSessionAnalyzer(void) {};
virtual ~CSessionAnalyzer(void) {};
void Init(bool enabled, string start_time, string end_time, color box_color, bool fill_box, bool show_mean, bool show_linreg, string prefix); void Init(bool enabled, string start_time, string end_time, color box_color, bool fill_box, bool show_mean, bool show_linreg, string prefix);
void Update(const int rates_total, const datetime &time[], const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type); void Update(const int rates_total, const datetime &time[], const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type);
void Cleanup(void); void Cleanup(void);
@@ -79,10 +82,12 @@ void CSessionAnalyzer::Cleanup(void)
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
// CORRECTED: Update method signature is simplified
void CSessionAnalyzer::Update(const int rates_total, const datetime &time[], const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type) void CSessionAnalyzer::Update(const int rates_total, const datetime &time[], const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type)
{ {
if(!m_enabled || rates_total < 2) if(!m_enabled || rates_total < 2)
return; return;
// The price_type is now passed directly to PrepareSourceData
if(!PrepareSourceData(rates_total, open, high, low, close, price_type)) if(!PrepareSourceData(rates_total, open, high, low, close, price_type))
return; return;
@@ -206,7 +211,7 @@ void CSessionAnalyzer::DrawSession(int start_bar, int end_bar, long session_id,
} }
} }
//+------------------------------------------------------------------+ // Base implementation for standard prices
bool CSessionAnalyzer::PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type) bool CSessionAnalyzer::PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type)
{ {
ArrayResize(m_src_high, rates_total); ArrayResize(m_src_high, rates_total);
@@ -244,6 +249,10 @@ bool CSessionAnalyzer::PrepareSourceData(int rates_total, const double &open[],
return true; return true;
} }
//+==================================================================+
//| |
//| CLASS 2: CSessionAnalyzer_HA (Heikin Ashi) - RE-INTRODUCED |
//| |
//+==================================================================+ //+==================================================================+
class CSessionAnalyzer_HA : public CSessionAnalyzer class CSessionAnalyzer_HA : public CSessionAnalyzer
{ {
@@ -252,6 +261,9 @@ private:
protected: protected:
virtual bool PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type) override; virtual bool PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type) override;
}; };
//+------------------------------------------------------------------+
//| CSessionAnalyzer_HA: Prepares the HA source data. |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
bool CSessionAnalyzer_HA::PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type) bool CSessionAnalyzer_HA::PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], ENUM_APPLIED_PRICE price_type)
{ {
@@ -261,8 +273,12 @@ bool CSessionAnalyzer_HA::PrepareSourceData(int rates_total, const double &open[
ArrayResize(ha_low, rates_total); ArrayResize(ha_low, rates_total);
ArrayResize(ha_close, rates_total); ArrayResize(ha_close, rates_total);
m_ha_calculator.Calculate(rates_total, open, high, low, close, ha_open, ha_high, ha_low, ha_close); m_ha_calculator.Calculate(rates_total, open, high, low, close, ha_open, ha_high, ha_low, ha_close);
// Prepare High and Low for the box drawing from HA candles
ArrayCopy(m_src_high, ha_high, 0, 0, rates_total); ArrayCopy(m_src_high, ha_high, 0, 0, rates_total);
ArrayCopy(m_src_low, ha_low, 0, 0, rates_total); ArrayCopy(m_src_low, ha_low, 0, 0, rates_total);
// Prepare the source price for Mean/LinReg from HA candles
ArrayResize(m_src_price, rates_total); ArrayResize(m_src_price, rates_total);
switch(price_type) switch(price_type)
{ {