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

refactor(indicators): Updated to use unified calculator

Browse Source
This commit is contained in:
Toh4iem9
2026-01-18 11:21:41 +01:00
parent d5a5b272ae
commit 80351bbb1e
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Indicators/MyIndicators/Authors/Ehlers/5_Ehlers_Hybrids/MACD_Laguerre_Line_Pro.mq5
+19 -22
View File
@@ -1,11 +1,10 @@
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//| MACD_Laguerre_Line_Pro.mq5 | //| MACD_Laguerre_Line_Pro.mq5 |
//| Copyright 2025, xxxxxxxx| //| Copyright 2026, xxxxxxxx|
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx" #property copyright "Copyright 2026, xxxxxxxx"
#property version "1.20" // Optimized for incremental calculation #property version "3.00" // Updated to use unified calculator
#property description "MACD Line calculated from two Laguerre filters." #property description "MACD Line calculated from two Laguerre filters."
#property description "Designed for applying external moving averages for testing."
#property indicator_separate_window #property indicator_separate_window
#property indicator_buffers 1 #property indicator_buffers 1
@@ -19,18 +18,18 @@
#property indicator_level1 0.0 #property indicator_level1 0.0
#property indicator_levelstyle STYLE_DOT #property indicator_levelstyle STYLE_DOT
#include <MyIncludes\MACD_Laguerre_Line_Calculator.mqh> #include <MyIncludes\MACD_Laguerre_Calculator.mqh>
//--- Input Parameters (Renamed for clarity) --- //--- Input Parameters
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 ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD; input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD;
//--- Indicator Buffers --- //--- Indicator Buffers
double BufferMACDLine[]; double BufferMACDLine[];
//--- Global calculator object --- //--- Global calculator object
CMACDLaguerreLineCalculator *g_calculator; CMACDLaguerreCalculator *g_calculator;
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
int OnInit() int OnInit()
@@ -39,14 +38,15 @@ int OnInit()
ArraySetAsSeries(BufferMACDLine, false); ArraySetAsSeries(BufferMACDLine, false);
if(InpSourcePrice <= PRICE_HA_CLOSE) if(InpSourcePrice <= PRICE_HA_CLOSE)
g_calculator = new CMACDLaguerreLineCalculator_HA(); g_calculator = new CMACDLaguerreCalculator_HA();
else else
g_calculator = new CMACDLaguerreLineCalculator(); g_calculator = new CMACDLaguerreCalculator();
//--- Pass the two gamma values directly --- // Initialize with dummy signal parameters (not used for Line Only)
if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpGamma1, InpGamma2)) if(CheckPointer(g_calculator) == POINTER_INVALID ||
!g_calculator.Init(InpGamma1, InpGamma2, 0.5, 9, SMOOTH_SMA))
{ {
Print("Failed to create or initialize MACD Laguerre Line Calculator."); Print("Failed to create or initialize MACD Laguerre Calculator.");
return(INIT_FAILED); return(INIT_FAILED);
} }
@@ -62,11 +62,9 @@ int OnInit()
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
void OnDeinit(const int reason) { if(CheckPointer(g_calculator) != POINTER_INVALID) delete g_calculator; } void OnDeinit(const int reason) { if(CheckPointer(g_calculator) != POINTER_INVALID) delete g_calculator; }
//+------------------------------------------------------------------+
//| Custom indicator calculation function |
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
int OnCalculate(const int rates_total, int OnCalculate(const int rates_total,
const int prev_calculated, // <--- Now used! const int prev_calculated,
const datetime &time[], const datetime &time[],
const double &open[], const double &open[],
const double &high[], const double &high[],
@@ -81,10 +79,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;
//--- Delegate calculation with prev_calculated optimization // Use the MACD Line only wrapper
g_calculator.Calculate(rates_total, prev_calculated, open, high, low, close, price_type, BufferMACDLine); g_calculator.CalculateMACDLineOnly(rates_total, prev_calculated, open, high, low, close, price_type, BufferMACDLine);
return(rates_total); return(rates_total);
} }
//+------------------------------------------------------------------+ //+------------------------------------------------------------------+
//+------------------------------------------------------------------+