mirror of
https://github.com/softwaredevelop/mql5.git
synced 2026-08-24 09:48:05 +00:00
refactor(indicators): Restored Trend/Level outputs
This commit is contained in:
@@ -10,9 +10,14 @@
|
|||||||
//--- Abstract base class for polymorphism
|
//--- Abstract base class for polymorphism
|
||||||
class CHoltMACalculator
|
class CHoltMACalculator
|
||||||
{
|
{
|
||||||
|
protected:
|
||||||
|
//--- Dummy Buffers for unused outputs
|
||||||
|
double m_dummy_trend[];
|
||||||
|
double m_dummy_level[];
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual bool Init(int period, double alpha, double beta, int forecast_p)=0;
|
virtual bool Init(int period, double alpha, double beta, int forecast_p)=0;
|
||||||
virtual void Calculate(int rates_total, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[],
|
virtual 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 &forecast_out[], double &upper_band_out[], double &lower_band_out[])=0;
|
double &forecast_out[], double &upper_band_out[], double &lower_band_out[])=0;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -26,15 +31,21 @@ public:
|
|||||||
~CHoltMACalculator_Std(void) { if(CheckPointer(m_engine)!=POINTER_INVALID) delete m_engine; }
|
~CHoltMACalculator_Std(void) { if(CheckPointer(m_engine)!=POINTER_INVALID) delete m_engine; }
|
||||||
|
|
||||||
virtual bool Init(int period, double alpha, double beta, int forecast_p) override { return m_engine.Init(period, alpha, beta, forecast_p); }
|
virtual bool Init(int period, double alpha, double beta, int forecast_p) override { return m_engine.Init(period, alpha, beta, forecast_p); }
|
||||||
virtual void Calculate(int rates_total, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[],
|
virtual 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 &forecast_out[], double &upper_band_out[], double &lower_band_out[]) override
|
double &forecast_out[], double &upper_band_out[], double &lower_band_out[]) override
|
||||||
{
|
{
|
||||||
if(CheckPointer(m_engine)==POINTER_INVALID)
|
if(CheckPointer(m_engine)==POINTER_INVALID)
|
||||||
return;
|
return;
|
||||||
double dummy_trend[], dummy_level[];
|
|
||||||
ArrayResize(dummy_trend, rates_total);
|
if(ArraySize(m_dummy_trend) != rates_total)
|
||||||
ArrayResize(dummy_level, rates_total);
|
{
|
||||||
m_engine.Calculate(rates_total, price_type, open, high, low, close, forecast_out, dummy_trend, dummy_level, upper_band_out, lower_band_out);
|
ArrayResize(m_dummy_trend, rates_total);
|
||||||
|
ArrayResize(m_dummy_level, rates_total);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pass dummy buffers for trend and level
|
||||||
|
m_engine.Calculate(rates_total, prev_calculated, price_type, open, high, low, close,
|
||||||
|
forecast_out, m_dummy_trend, m_dummy_level, upper_band_out, lower_band_out);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -48,15 +59,20 @@ public:
|
|||||||
~CHoltMACalculator_HA(void) { if(CheckPointer(m_engine)!=POINTER_INVALID) delete m_engine; }
|
~CHoltMACalculator_HA(void) { if(CheckPointer(m_engine)!=POINTER_INVALID) delete m_engine; }
|
||||||
|
|
||||||
virtual bool Init(int period, double alpha, double beta, int forecast_p) override { return m_engine.Init(period, alpha, beta, forecast_p); }
|
virtual bool Init(int period, double alpha, double beta, int forecast_p) override { return m_engine.Init(period, alpha, beta, forecast_p); }
|
||||||
virtual void Calculate(int rates_total, ENUM_APPLIED_PRICE price_type, const double &open[], const double &high[], const double &low[], const double &close[],
|
virtual 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 &forecast_out[], double &upper_band_out[], double &lower_band_out[]) override
|
double &forecast_out[], double &upper_band_out[], double &lower_band_out[]) override
|
||||||
{
|
{
|
||||||
if(CheckPointer(m_engine)==POINTER_INVALID)
|
if(CheckPointer(m_engine)==POINTER_INVALID)
|
||||||
return;
|
return;
|
||||||
double dummy_trend[], dummy_level[];
|
|
||||||
ArrayResize(dummy_trend, rates_total);
|
if(ArraySize(m_dummy_trend) != rates_total)
|
||||||
ArrayResize(dummy_level, rates_total);
|
{
|
||||||
m_engine.Calculate(rates_total, price_type, open, high, low, close, forecast_out, dummy_trend, dummy_level, upper_band_out, lower_band_out);
|
ArrayResize(m_dummy_trend, rates_total);
|
||||||
|
ArrayResize(m_dummy_level, rates_total);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_engine.Calculate(rates_total, prev_calculated, price_type, open, high, low, close,
|
||||||
|
forecast_out, m_dummy_trend, m_dummy_level, upper_band_out, lower_band_out);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
//+------------------------------------------------------------------+
|
//+------------------------------------------------------------------+
|
||||||
|
|||||||
Reference in New Issue
Block a user