refactor: Added signal line and fixed state management

This commit is contained in:
Toh4iem9
2025-11-23 10:24:07 +01:00
parent 05ef5b1d60
commit 0bc43842b5
@@ -4,22 +4,24 @@
//| |
//+------------------------------------------------------------------+
#property copyright "Copyright 2025, xxxxxxxx"
#property link ""
#property version "1.00"
#property description "John Ehlers' Adaptive Laguerre RSI. The filter's coefficient (gamma)"
#property description "is dynamically adjusted based on the measured market cycle period."
#property version "1.10" // Added signal line and fixed state management
#property description "John Ehlers' Adaptive Laguerre RSI with an optional signal line."
//--- Indicator Window and Plot Properties ---
#property indicator_separate_window
#property indicator_buffers 1
#property indicator_plots 1
#property indicator_buffers 2
#property indicator_plots 2
#property indicator_label1 "Adaptive LRSI"
#property indicator_type1 DRAW_LINE
#property indicator_color1 clrTurquoise
#property indicator_style1 STYLE_SOLID
#property indicator_width1 1
#property indicator_label1 "Adaptive LRSI"
#property indicator_label2 "Signal"
#property indicator_type2 DRAW_LINE
#property indicator_color2 clrOrangeRed
#property indicator_style2 STYLE_DOT
#property indicator_width2 1
//--- Scale and Level Properties ---
#property indicator_minimum 0
#property indicator_maximum 100
#property indicator_level1 20.0
@@ -28,67 +30,69 @@
#property indicator_levelcolor clrGray
#property indicator_levelstyle STYLE_DOT
//--- Include the calculator engine ---
#include <MyIncludes\Laguerre_RSI_Adaptive_Calculator.mqh>
enum ENUM_LRSI_DISPLAY_MODE { DISPLAY_LRSI_ONLY, DISPLAY_LRSI_AND_SIGNAL };
//--- Input Parameters ---
input group "Laguerre RSI Settings"
input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice = PRICE_CLOSE_STD;
//--- Indicator Buffers ---
double BufferLRSI[];
input group "Signal Line Settings"
input ENUM_LRSI_DISPLAY_MODE InpDisplayMode = DISPLAY_LRSI_AND_SIGNAL;
input int InpSignalPeriod = 9;
input ENUM_MA_TYPE InpSignalMAType = EMA;
//--- Global calculator object (as a base class pointer) ---
//--- Indicator Buffers ---
double BufferLRSI[], BufferSignal[];
//--- Global calculator object ---
CLaguerreRSIAdaptiveCalculator *g_calculator;
//+------------------------------------------------------------------+
int OnInit()
{
SetIndexBuffer(0, BufferLRSI, INDICATOR_DATA);
ArraySetAsSeries(BufferLRSI, false);
SetIndexBuffer(0, BufferLRSI, INDICATOR_DATA);
SetIndexBuffer(1, BufferSignal, INDICATOR_DATA);
ArraySetAsSeries(BufferLRSI, false);
ArraySetAsSeries(BufferSignal, false);
PlotIndexSetDouble(1, PLOT_EMPTY_VALUE, EMPTY_VALUE);
if(InpSourcePrice <= PRICE_HA_CLOSE)
{
g_calculator = new CLaguerreRSIAdaptiveCalculator_HA();
IndicatorSetString(INDICATOR_SHORTNAME, "Adaptive LRSI HA");
}
else
{
g_calculator = new CLaguerreRSIAdaptiveCalculator();
IndicatorSetString(INDICATOR_SHORTNAME, "Adaptive LRSI");
}
if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init())
if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpSignalPeriod, InpSignalMAType))
{
Print("Failed to create or initialize Adaptive Laguerre RSI Calculator object.");
return(INIT_FAILED);
}
IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("Adaptive LRSI%s", (InpSourcePrice <= PRICE_HA_CLOSE ? " HA" : "")));
PlotIndexSetInteger(0, PLOT_DRAW_BEGIN, 10);
PlotIndexSetInteger(1, PLOT_DRAW_BEGIN, 10 + InpSignalPeriod - 1);
IndicatorSetInteger(INDICATOR_DIGITS, 2);
return(INIT_SUCCEEDED);
}
//+------------------------------------------------------------------+
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; }
//+------------------------------------------------------------------+
int OnCalculate(const int rates_total, const int, const datetime&[], const double &open[], const double &high[], const double &low[], const double &close[], const long&[], const long&[], const int&[])
{
if(CheckPointer(g_calculator) == POINTER_INVALID)
return 0;
ENUM_APPLIED_PRICE price_type = (InpSourcePrice <= PRICE_HA_CLOSE) ? (ENUM_APPLIED_PRICE)(-(int)InpSourcePrice) : (ENUM_APPLIED_PRICE)InpSourcePrice;
g_calculator.Calculate(rates_total, price_type, open, high, low, close, BufferLRSI, BufferSignal);
ENUM_APPLIED_PRICE price_type;
if(InpSourcePrice <= PRICE_HA_CLOSE)
price_type = (ENUM_APPLIED_PRICE)(-(int)InpSourcePrice);
else
price_type = (ENUM_APPLIED_PRICE)InpSourcePrice;
g_calculator.Calculate(rates_total, price_type, open, high, low, close, BufferLRSI);
if(InpDisplayMode == DISPLAY_LRSI_ONLY)
{
for(int i=0; i<rates_total; i++)
BufferSignal[i] = EMPTY_VALUE;
}
return(rates_total);
}