refactor(indicators): Optimized for incremental calculation

This commit is contained in:
Toh4iem9
2026-01-18 19:22:13 +01:00
parent 05bcdbf412
commit e6231832cb
+179 -100
View File
@@ -2,79 +2,149 @@
//| RSIH_Calculator.mqh | //| RSIH_Calculator.mqh |
//| Calculation engine for Ehlers' RSI with Hann Windowing (RSIH) | //| Calculation engine for Ehlers' RSI with Hann Windowing (RSIH) |
//| and Noise Elimination Technology (NET). | //| and Noise Elimination Technology (NET). |
//| Copyright 2025, xxxxxxxx | //| VERSION 2.00: Optimized for incremental calculation. |
//| Copyright 2026, xxxxxxxx |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx" #property copyright "Copyright 2026, xxxxxxxx"
#include <MyIncludes\HeikinAshi_Tools.mqh> #include <MyIncludes\Windowed_MA_Calculator.mqh>
//+==================================================================+ //+==================================================================+
//| |
//| CLASS 1: CRSIHCalculator (Base Class) | //| CLASS 1: CRSIHCalculator (Base Class) |
//| |
//+==================================================================+ //+==================================================================+
class CRSIHCalculator class CRSIHCalculator
{ {
protected: protected:
int m_period_rsi; int m_period_rsi;
int m_period_net; int m_period_net;
double m_price[];
virtual bool PreparePriceSeries(int rates_total, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[]); //--- Composition: Windowed MA Engines for CU and CD
CWindowedMACalculator *m_cu_engine;
CWindowedMACalculator *m_cd_engine;
//--- Persistent Buffers
double m_price[];
double m_cu_raw[]; // Raw Closes Up
double m_cd_raw[]; // Raw Closes Down
double m_cu_smooth[]; // Smoothed CU
double m_cd_smooth[]; // Smoothed CD
virtual bool PreparePriceSeries(int rates_total, int start_index, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[]);
virtual void CreateEngines(void);
public: public:
CRSIHCalculator(void) {}; CRSIHCalculator(void);
virtual ~CRSIHCalculator(void) {}; virtual ~CRSIHCalculator(void);
bool Init(int rsi_period, int net_period); bool Init(int rsi_period, int net_period);
void Calculate(int rates_total, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[], void Calculate(int rates_total, int prev_calculated, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[],
double &rsih_buffer[], double &net_buffer[]); double &rsih_buffer[], double &net_buffer[]);
}; };
//+------------------------------------------------------------------+
//| Constructor |
//+------------------------------------------------------------------+
CRSIHCalculator::CRSIHCalculator(void)
{
m_cu_engine = NULL;
m_cd_engine = NULL;
}
//+------------------------------------------------------------------+
//| Destructor |
//+------------------------------------------------------------------+
CRSIHCalculator::~CRSIHCalculator(void)
{
if(CheckPointer(m_cu_engine) != POINTER_INVALID)
delete m_cu_engine;
if(CheckPointer(m_cd_engine) != POINTER_INVALID)
delete m_cd_engine;
}
//+------------------------------------------------------------------+
//| Factory Method |
//+------------------------------------------------------------------+
void CRSIHCalculator::CreateEngines(void)
{
m_cu_engine = new CWindowedMACalculator();
m_cd_engine = new CWindowedMACalculator();
}
//+------------------------------------------------------------------+
//| Init |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
bool CRSIHCalculator::Init(int rsi_period, int net_period) bool CRSIHCalculator::Init(int rsi_period, int net_period)
{ {
m_period_rsi = (rsi_period < 2) ? 2 : rsi_period; m_period_rsi = (rsi_period < 2) ? 2 : rsi_period;
m_period_net = (net_period < 2) ? 2 : net_period; m_period_net = (net_period < 2) ? 2 : net_period;
CreateEngines();
// Initialize engines with SOURCE_PRICE (we pass raw CU/CD arrays)
if(CheckPointer(m_cu_engine) == POINTER_INVALID || !m_cu_engine.Init(m_period_rsi, SOURCE_PRICE))
return false;
if(CheckPointer(m_cd_engine) == POINTER_INVALID || !m_cd_engine.Init(m_period_rsi, SOURCE_PRICE))
return false;
return true; return true;
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
void CRSIHCalculator::Calculate(int rates_total, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[], //| Main Calculation (Optimized) |
//+------------------------------------------------------------------+
void CRSIHCalculator::Calculate(int rates_total, int prev_calculated, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[],
double &rsih_buffer[], double &net_buffer[]) double &rsih_buffer[], double &net_buffer[])
{ {
if(rates_total < m_period_rsi + 1) if(rates_total < m_period_rsi + 1)
return; return;
if(!PreparePriceSeries(rates_total, price_type, open, high, low, close))
int start_index = (prev_calculated == 0) ? 0 : prev_calculated - 1;
// Resize buffers
if(ArraySize(m_price) != rates_total)
{
ArrayResize(m_price, rates_total);
ArrayResize(m_cu_raw, rates_total);
ArrayResize(m_cd_raw, rates_total);
ArrayResize(m_cu_smooth, rates_total);
ArrayResize(m_cd_smooth, rates_total);
}
// 1. Prepare Price
if(!PreparePriceSeries(rates_total, start_index, price_type, open, high, low, close))
return; return;
// --- Step 1: Calculate the base RSIH indicator --- // 2. Calculate Raw CU and CD
for(int i = m_period_rsi; i < rates_total; i++) int loop_start = MathMax(1, start_index);
for(int i = loop_start; i < rates_total; i++)
{ {
double cu = 0.0, cd = 0.0; double diff = m_price[i] - m_price[i-1];
for(int j = 1; j <= m_period_rsi; j++) m_cu_raw[i] = (diff > 0) ? diff : 0;
{ m_cd_raw[i] = (diff < 0) ? -diff : 0;
double diff = m_price[i - j + 1] - m_price[i - j]; }
double weight = 1.0 - cos(2 * M_PI * j / (m_period_rsi + 1.0));
if(diff > 0) // 3. Smooth CU and CD using Windowed MA Engine
cu += diff * weight; m_cu_engine.CalculateOnArray(rates_total, prev_calculated, m_cu_raw, m_cu_smooth);
else m_cd_engine.CalculateOnArray(rates_total, prev_calculated, m_cd_raw, m_cd_smooth);
cd += -diff * weight;
} // 4. Calculate RSIH
if(cu + cd > 0) int rsih_start = MathMax(m_period_rsi, start_index);
rsih_buffer[i] = (cu - cd) / (cu + cd); for(int i = rsih_start; i < rates_total; i++)
{
double sum = m_cu_smooth[i] + m_cd_smooth[i];
if(sum > 0)
rsih_buffer[i] = (m_cu_smooth[i] - m_cd_smooth[i]) / sum;
else else
rsih_buffer[i] = (i > 0) ? rsih_buffer[i-1] : 0.0; rsih_buffer[i] = (i > 0) ? rsih_buffer[i-1] : 0.0;
} }
// --- Step 2: Apply Noise Elimination Technology (NET) --- // 5. Calculate NET (Noise Elimination Technology)
if(m_period_net > 0) if(m_period_net > 0)
{ {
double denominator = 0.5 * m_period_net * (m_period_net - 1); double denominator = 0.5 * m_period_net * (m_period_net - 1);
if(denominator <= 0) int net_start = MathMax(m_period_rsi + m_period_net, start_index);
return;
for(int i = m_period_rsi + m_period_net; i < rates_total; i++) for(int i = net_start; i < rates_total; i++)
{ {
double numerator = 0; double numerator = 0;
// Double loop for Kendall correlation // Double loop for Kendall correlation
@@ -82,11 +152,8 @@ void CRSIHCalculator::Calculate(int rates_total, ENUM_APPLIED_PRICE price_type,
{ {
for(int k = 0; k < j; k++) for(int k = 0; k < j; k++)
{ {
// Ehlers' simplified formula is Num = Num - Sign(X[count] - X[K]) // Sign(X[fresher] - X[older])
// This implies adding the sign of (X[fresher] - X[older])
// In our arrays, i-k is fresher than i-j
double diff = rsih_buffer[i-k] - rsih_buffer[i-j]; double diff = rsih_buffer[i-k] - rsih_buffer[i-j];
// CORRECTED: Use addition instead of subtraction to match Ehlers' logic
numerator += (diff > 0 ? 1 : (diff < 0 ? -1 : 0)); numerator += (diff > 0 ? 1 : (diff < 0 ? -1 : 0));
} }
} }
@@ -96,90 +163,102 @@ void CRSIHCalculator::Calculate(int rates_total, ENUM_APPLIED_PRICE price_type,
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
bool CRSIHCalculator::PreparePriceSeries(int rates_total, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[]) //| Prepare Price (Standard) |
//+------------------------------------------------------------------+
bool CRSIHCalculator::PreparePriceSeries(int rates_total, int start_index, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[])
{ {
ArrayResize(m_price, rates_total); for(int i = start_index; i < rates_total; i++)
switch(price_type)
{ {
case PRICE_CLOSE: switch(price_type)
ArrayCopy(m_price, close, 0, 0, rates_total); {
break; case PRICE_CLOSE:
case PRICE_OPEN: m_price[i] = close[i];
ArrayCopy(m_price, open, 0, 0, rates_total); break;
break; case PRICE_OPEN:
case PRICE_HIGH: m_price[i] = open[i];
ArrayCopy(m_price, high, 0, 0, rates_total); break;
break; case PRICE_HIGH:
case PRICE_LOW: m_price[i] = high[i];
ArrayCopy(m_price, low, 0, 0, rates_total); break;
break; case PRICE_LOW:
case PRICE_MEDIAN: m_price[i] = low[i];
for(int i=0; i<rates_total; i++) break;
m_price[i] = (high[i]+low[i])/2.0; case PRICE_MEDIAN:
break; m_price[i] = (high[i] + low[i]) / 2.0;
case PRICE_TYPICAL: break;
for(int i=0; i<rates_total; i++) case PRICE_TYPICAL:
m_price[i] = (high[i]+low[i]+close[i])/3.0; m_price[i] = (high[i] + low[i] + close[i]) / 3.0;
break; break;
case PRICE_WEIGHTED: case PRICE_WEIGHTED:
for(int i=0; i<rates_total; i++) m_price[i] = (high[i] + low[i] + 2 * close[i]) / 4.0;
m_price[i] = (high[i]+low[i]+close[i]+close[i])/4.0; break;
break; default:
default: m_price[i] = close[i];
return false; break;
}
} }
return true; return true;
} }
//+==================================================================+
//| CLASS 2: CRSIHCalculator_HA (Heikin Ashi) |
//+==================================================================+ //+==================================================================+
class CRSIHCalculator_HA : public CRSIHCalculator class CRSIHCalculator_HA : public CRSIHCalculator
{ {
private: private:
CHeikinAshi_Calculator m_ha_calculator; CHeikinAshi_Calculator m_ha_calculator;
double m_ha_open[], m_ha_high[], m_ha_low[], m_ha_close[];
protected: protected:
virtual bool PreparePriceSeries(int rates_total, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[]) override; virtual bool PreparePriceSeries(int rates_total, int start_index, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[]) override;
}; };
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
bool CRSIHCalculator_HA::PreparePriceSeries(int rates_total, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[]) //| Prepare Price (Heikin Ashi) |
//+------------------------------------------------------------------+
bool CRSIHCalculator_HA::PreparePriceSeries(int rates_total, int start_index, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[])
{ {
double ha_open[], ha_high[], ha_low[], ha_close[]; if(ArraySize(m_ha_open) != rates_total)
ArrayResize(ha_open, rates_total);
ArrayResize(ha_high, rates_total);
ArrayResize(ha_low, 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);
ArrayResize(m_price, rates_total);
switch(price_type)
{ {
case PRICE_CLOSE: ArrayResize(m_ha_open, rates_total);
ArrayCopy(m_price, ha_close, 0, 0, rates_total); ArrayResize(m_ha_high, rates_total);
break; ArrayResize(m_ha_low, rates_total);
case PRICE_OPEN: ArrayResize(m_ha_close, rates_total);
ArrayCopy(m_price, ha_open, 0, 0, rates_total); }
break;
case PRICE_HIGH: m_ha_calculator.Calculate(rates_total, start_index, open, high, low, close,
ArrayCopy(m_price, ha_high, 0, 0, rates_total); m_ha_open, m_ha_high, m_ha_low, m_ha_close);
break;
case PRICE_LOW: for(int i = start_index; i < rates_total; i++)
ArrayCopy(m_price, ha_low, 0, 0, rates_total); {
break; switch(price_type)
case PRICE_MEDIAN: {
for(int i=0; i<rates_total; i++) case PRICE_CLOSE:
m_price[i] = (ha_high[i]+ha_low[i])/2.0; m_price[i] = m_ha_close[i];
break; break;
case PRICE_TYPICAL: case PRICE_OPEN:
for(int i=0; i<rates_total; i++) m_price[i] = m_ha_open[i];
m_price[i] = (ha_high[i]+ha_low[i]+ha_close[i])/3.0; break;
break; case PRICE_HIGH:
case PRICE_WEIGHTED: m_price[i] = m_ha_high[i];
for(int i=0; i<rates_total; i++) break;
m_price[i] = (ha_high[i]+ha_low[i]+ha_close[i]+ha_close[i])/4.0; case PRICE_LOW:
break; m_price[i] = m_ha_low[i];
default: break;
return false; case PRICE_MEDIAN:
m_price[i] = (m_ha_high[i] + m_ha_low[i]) / 2.0;
break;
case PRICE_TYPICAL:
m_price[i] = (m_ha_high[i] + m_ha_low[i] + m_ha_close[i]) / 3.0;
break;
case PRICE_WEIGHTED:
m_price[i] = (m_ha_high[i] + m_ha_low[i] + 2 * m_ha_close[i]) / 4.0;
break;
default:
m_price[i] = m_ha_close[i];
break;
}
} }
return true; return true;
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//+------------------------------------------------------------------+