refactor(indicators): Optimized for incremental calculation

This commit is contained in:
Toh4iem9
2026-01-02 16:37:12 +01:00
parent 26e66faf6b
commit ee9e2389b8
+83 -55
View File
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| Vortex_Calculator.mqh| //| Vortex_Calculator.mqh|
//| Calculation engine for Standard and Heikin Ashi Vortex. | //| VERSION 2.00: Optimized for incremental calculation. |
//| Copyright 2025, xxxxxxxx | //| Copyright 2025, xxxxxxxx |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx" #property copyright "Copyright 2025, xxxxxxxx"
@@ -8,29 +8,33 @@
#include <MyIncludes\HeikinAshi_Tools.mqh> #include <MyIncludes\HeikinAshi_Tools.mqh>
//+==================================================================+ //+==================================================================+
//| |
//| CLASS 1: CVortexCalculator (Base Class) | //| CLASS 1: CVortexCalculator (Base Class) |
//| |
//+==================================================================+ //+==================================================================+
class CVortexCalculator class CVortexCalculator
{ {
protected: protected:
int m_period; int m_period;
double m_src_high[], m_src_low[], m_src_close[];
virtual bool PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[]); //--- Persistent Buffers for Incremental Calculation
double m_src_high[], m_src_low[], m_src_close[];
double m_tr[], m_vm_plus[], m_vm_minus[];
//--- Updated: Accepts start_index
virtual bool PrepareSourceData(int rates_total, int start_index, const double &open[], const double &high[], const double &low[], const double &close[]);
public: public:
CVortexCalculator(void) {}; CVortexCalculator(void) {};
virtual ~CVortexCalculator(void) {}; virtual ~CVortexCalculator(void) {};
bool Init(int period); bool Init(int period);
void Calculate(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[],
//--- Updated: Accepts prev_calculated
void Calculate(int rates_total, int prev_calculated, const double &open[], const double &high[], const double &low[], const double &close[],
double &vi_plus_buffer[], double &vi_minus_buffer[]); double &vi_plus_buffer[], double &vi_minus_buffer[]);
}; };
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| CVortexCalculator: Initialization | //| Init |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
bool CVortexCalculator::Init(int period) bool CVortexCalculator::Init(int period)
{ {
@@ -39,91 +43,115 @@ bool CVortexCalculator::Init(int period)
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| CVortexCalculator: Main Calculation Method (Shared Logic) | //| Main Calculation (Optimized) |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
void CVortexCalculator::Calculate(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[], void CVortexCalculator::Calculate(int rates_total, int prev_calculated, const double &open[], const double &high[], const double &low[], const double &close[],
double &vi_plus_buffer[], double &vi_minus_buffer[]) double &vi_plus_buffer[], double &vi_minus_buffer[])
{ {
if(rates_total <= m_period) if(rates_total <= m_period)
return; return;
if(!PrepareSourceData(rates_total, open, high, low, close))
return;
double tr[], vm_plus[], vm_minus[]; //--- 1. Determine Start Index
ArrayResize(tr, rates_total); int start_index;
ArrayResize(vm_plus, rates_total); if(prev_calculated == 0)
ArrayResize(vm_minus, rates_total); start_index = 0;
else
start_index = prev_calculated - 1;
for(int i = 1; i < rates_total; i++) //--- 2. Resize Buffers
if(ArraySize(m_src_high) != rates_total)
{ {
tr[i] = MathMax(m_src_high[i], m_src_close[i-1]) - MathMin(m_src_low[i], m_src_close[i-1]); ArrayResize(m_src_high, rates_total);
vm_plus[i] = MathAbs(m_src_high[i] - m_src_low[i-1]); ArrayResize(m_src_low, rates_total);
vm_minus[i] = MathAbs(m_src_low[i] - m_src_high[i-1]); ArrayResize(m_src_close, rates_total);
ArrayResize(m_tr, rates_total);
ArrayResize(m_vm_plus, rates_total);
ArrayResize(m_vm_minus, rates_total);
} }
double sum_tr = 0, sum_vplus = 0, sum_vminus = 0; //--- 3. Prepare Source Data (Optimized)
for(int i = 1; i < rates_total; i++) if(!PrepareSourceData(rates_total, start_index, open, high, low, close))
{ return;
sum_tr += tr[i];
sum_vplus += vm_plus[i];
sum_vminus += vm_minus[i];
if(i > m_period) //--- 4. Calculate TR and VM (Incremental)
int loop_start_tr = MathMax(1, start_index);
for(int i = loop_start_tr; i < rates_total; i++)
{
m_tr[i] = MathMax(m_src_high[i], m_src_close[i-1]) - MathMin(m_src_low[i], m_src_close[i-1]);
m_vm_plus[i] = MathAbs(m_src_high[i] - m_src_low[i-1]);
m_vm_minus[i] = MathAbs(m_src_low[i] - m_src_high[i-1]);
}
//--- 5. Calculate Vortex (Incremental Sliding Window)
int loop_start_vi = MathMax(m_period, start_index);
for(int i = loop_start_vi; i < rates_total; i++)
{
double sum_tr = 0, sum_vplus = 0, sum_vminus = 0;
// Sum over the lookback period
// Optimization: For standard periods (14-21), a loop is fast enough.
for(int j = 0; j < m_period; j++)
{ {
sum_tr -= tr[i - m_period]; sum_tr += m_tr[i-j];
sum_vplus -= vm_plus[i - m_period]; sum_vplus += m_vm_plus[i-j];
sum_vminus -= vm_minus[i - m_period]; sum_vminus += m_vm_minus[i-j];
} }
if(i >= m_period) if(sum_tr > 0)
{ {
if(sum_tr > 0) vi_plus_buffer[i] = sum_vplus / sum_tr;
{ vi_minus_buffer[i] = sum_vminus / sum_tr;
vi_plus_buffer[i] = sum_vplus / sum_tr; }
vi_minus_buffer[i] = sum_vminus / sum_tr; else
} {
vi_plus_buffer[i] = 0;
vi_minus_buffer[i] = 0;
} }
} }
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| CVortexCalculator: Prepares the standard source data. | //| Prepare Source Data (Standard - Optimized) |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
bool CVortexCalculator::PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[]) bool CVortexCalculator::PrepareSourceData(int rates_total, int start_index, const double &open[], const double &high[], const double &low[], const double &close[])
{ {
ArrayResize(m_src_high, rates_total); for(int i = start_index; i < rates_total; i++)
ArrayCopy(m_src_high, high, 0, 0, rates_total); {
ArrayResize(m_src_low, rates_total); m_src_high[i] = high[i];
ArrayCopy(m_src_low, low, 0, 0, rates_total); m_src_low[i] = low[i];
ArrayResize(m_src_close, rates_total); m_src_close[i] = close[i];
ArrayCopy(m_src_close, close, 0, 0, rates_total); }
return true; return true;
} }
//+==================================================================+ //+==================================================================+
//| | //| CLASS 2: CVortexCalculator_HA (Heikin Ashi) |
//| CLASS 2: CVortexCalculator_HA (Heikin Ashi) |
//| |
//+==================================================================+ //+==================================================================+
class CVortexCalculator_HA : public CVortexCalculator class CVortexCalculator_HA : public CVortexCalculator
{ {
private: private:
CHeikinAshi_Calculator m_ha_calculator; CHeikinAshi_Calculator m_ha_calculator;
// Internal HA buffers
double m_ha_open[];
protected: protected:
virtual bool PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[]) override; virtual bool PrepareSourceData(int rates_total, int start_index, const double &open[], const double &high[], const double &low[], const double &close[]) override;
}; };
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| CVortexCalculator_HA: Prepares the HA source data. | //| Prepare Source Data (Heikin Ashi - Optimized) |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
bool CVortexCalculator_HA::PrepareSourceData(int rates_total, const double &open[], const double &high[], const double &low[], const double &close[]) bool CVortexCalculator_HA::PrepareSourceData(int rates_total, int start_index, const double &open[], const double &high[], const double &low[], const double &close[])
{ {
double ha_open[]; if(ArraySize(m_ha_open) != rates_total)
ArrayResize(ha_open, rates_total); ArrayResize(m_ha_open, rates_total);
ArrayResize(m_src_high, rates_total);
ArrayResize(m_src_low, rates_total); //--- STRICT CALL: Use the optimized 10-param HA calculation
ArrayResize(m_src_close, rates_total); m_ha_calculator.Calculate(rates_total, start_index, open, high, low, close,
m_ha_calculator.Calculate(rates_total, open, high, low, close, ha_open, m_src_high, m_src_low, m_src_close); m_ha_open, m_src_high, m_src_low, m_src_close);
return true; return true;
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+