mirror of
https://github.com/softwaredevelop/mql5.git
synced 2026-08-21 00:08:07 +00:00
refactor(indicators): Updated to use unified calculator
This commit is contained in:
+14
-16
@@ -1,9 +1,9 @@
|
|||||||
//+------------------------------------------------------------------+
|
//+------------------------------------------------------------------+
|
||||||
//| MACD_Laguerre_Histogram_Pro.mq5 |
|
//| MACD_Laguerre_Histogram_Pro.mq5 |
|
||||||
//| Copyright 2025, xxxxxxxx|
|
//| Copyright 2026, xxxxxxxx|
|
||||||
//+------------------------------------------------------------------+
|
//+------------------------------------------------------------------+
|
||||||
#property copyright "Copyright 2025, xxxxxxxx"
|
#property copyright "Copyright 2026, xxxxxxxx"
|
||||||
#property version "2.00" // Refactored to use Engines
|
#property version "2.10" // Updated to use unified calculator
|
||||||
#property description "Histogram for the Laguerre MACD with a selectable signal line."
|
#property description "Histogram for the Laguerre MACD with a selectable signal line."
|
||||||
|
|
||||||
#property indicator_separate_window
|
#property indicator_separate_window
|
||||||
@@ -14,20 +14,18 @@
|
|||||||
#property indicator_type1 DRAW_HISTOGRAM
|
#property indicator_type1 DRAW_HISTOGRAM
|
||||||
#property indicator_color1 clrSilver
|
#property indicator_color1 clrSilver
|
||||||
#property indicator_width1 1
|
#property indicator_width1 1
|
||||||
#property indicator_level1 0.0
|
|
||||||
#property indicator_levelstyle STYLE_DOT
|
|
||||||
|
|
||||||
#include <MyIncludes\MACD_Laguerre_Histogram_Calculator.mqh>
|
#include <MyIncludes\MACD_Laguerre_Calculator.mqh>
|
||||||
|
|
||||||
//--- Input Parameters ---
|
//--- Input Parameters ---
|
||||||
input group "Laguerre MACD Settings"
|
input group "Laguerre MACD Settings"
|
||||||
input double InpGamma1 = 0.2; // Fast Laguerre Gamma (smaller value)
|
input double InpGamma1 = 0.2; // Fast Laguerre Gamma
|
||||||
input double InpGamma2 = 0.8; // Slow Laguerre Gamma (larger value)
|
input double InpGamma2 = 0.8; // Slow Laguerre Gamma
|
||||||
|
|
||||||
input group "Signal Line Settings"
|
input group "Signal Line Settings"
|
||||||
input ENUM_SMOOTHING_METHOD_LAGUERRE InpSignalMAType = SMOOTH_Laguerre;
|
input ENUM_SMOOTHING_METHOD_LAGUERRE InpSignalMAType = SMOOTH_Laguerre;
|
||||||
input int InpSignalPeriod = 9; // Period (for MA types)
|
input int InpSignalPeriod = 9;
|
||||||
input double InpSignalGamma = 0.5; // Gamma (for Laguerre type)
|
input double InpSignalGamma = 0.5;
|
||||||
|
|
||||||
input group "Price Source"
|
input group "Price Source"
|
||||||
input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD;
|
input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD;
|
||||||
@@ -36,7 +34,7 @@ input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD;
|
|||||||
double BufferHistogram[];
|
double BufferHistogram[];
|
||||||
|
|
||||||
//--- Global calculator object ---
|
//--- Global calculator object ---
|
||||||
CMACDLaguerreHistogramCalculator *g_calculator;
|
CMACDLaguerreCalculator *g_calculator;
|
||||||
|
|
||||||
//+------------------------------------------------------------------+
|
//+------------------------------------------------------------------+
|
||||||
int OnInit()
|
int OnInit()
|
||||||
@@ -45,14 +43,14 @@ int OnInit()
|
|||||||
ArraySetAsSeries(BufferHistogram, false);
|
ArraySetAsSeries(BufferHistogram, false);
|
||||||
|
|
||||||
if(InpSourcePrice <= PRICE_HA_CLOSE)
|
if(InpSourcePrice <= PRICE_HA_CLOSE)
|
||||||
g_calculator = new CMACDLaguerreHistogramCalculator_HA();
|
g_calculator = new CMACDLaguerreCalculator_HA();
|
||||||
else
|
else
|
||||||
g_calculator = new CMACDLaguerreHistogramCalculator();
|
g_calculator = new CMACDLaguerreCalculator();
|
||||||
|
|
||||||
if(CheckPointer(g_calculator) == POINTER_INVALID ||
|
if(CheckPointer(g_calculator) == POINTER_INVALID ||
|
||||||
!g_calculator.Init(InpGamma1, InpGamma2, InpSignalGamma, InpSignalPeriod, InpSignalMAType))
|
!g_calculator.Init(InpGamma1, InpGamma2, InpSignalGamma, InpSignalPeriod, InpSignalMAType))
|
||||||
{
|
{
|
||||||
Print("Failed to create or initialize MACD Laguerre Histogram Calculator.");
|
Print("Failed to create or initialize MACD Laguerre Calculator.");
|
||||||
return(INIT_FAILED);
|
return(INIT_FAILED);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,9 +84,9 @@ int OnCalculate(const int rates_total,
|
|||||||
|
|
||||||
ENUM_APPLIED_PRICE price_type = (InpSourcePrice <= PRICE_HA_CLOSE) ? (ENUM_APPLIED_PRICE)(-(int)InpSourcePrice) : (ENUM_APPLIED_PRICE)InpSourcePrice;
|
ENUM_APPLIED_PRICE price_type = (InpSourcePrice <= PRICE_HA_CLOSE) ? (ENUM_APPLIED_PRICE)(-(int)InpSourcePrice) : (ENUM_APPLIED_PRICE)InpSourcePrice;
|
||||||
|
|
||||||
g_calculator.Calculate(rates_total, prev_calculated, open, high, low, close, price_type, BufferHistogram);
|
// Use the Histogram-only wrapper method
|
||||||
|
g_calculator.CalculateHistogramOnly(rates_total, prev_calculated, open, high, low, close, price_type, BufferHistogram);
|
||||||
|
|
||||||
return(rates_total);
|
return(rates_total);
|
||||||
}
|
}
|
||||||
//+------------------------------------------------------------------+
|
//+------------------------------------------------------------------+
|
||||||
//+------------------------------------------------------------------+
|
|
||||||
|
|||||||
Reference in New Issue
Block a user