From b4ecd635bfc18b3c9134f7d79886ab22263ca7c4 Mon Sep 17 00:00:00 2001
From: Toh4iem9 <Toh4iem9@forge.mql5.io>
Date: Wed, 31 Dec 2025 18:26:43 +0100
Subject: [PATCH] refactor(indicators): Refactored to use MovingAverage_Engine

---
 Indicators/MyIndicators/CHO_Pro.mq5 | 34 ++++++++---------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/Indicators/MyIndicators/CHO_Pro.mq5 b/Indicators/MyIndicators/CHO_Pro.mq5
index d8c41aa..32d89a2 100644
--- a/Indicators/MyIndicators/CHO_Pro.mq5
+++ b/Indicators/MyIndicators/CHO_Pro.mq5
@@ -1,11 +1,9 @@
 //+------------------------------------------------------------------+
 //|                                                       CHO_Pro.mq5|
 //|                                          Copyright 2025, xxxxxxxx|
-//|                                                                  |
 //+------------------------------------------------------------------+
 #property copyright "Copyright 2025, xxxxxxxx"
-#property link      ""
-#property version   "2.01" // Corrected calculator call signature
+#property version   "3.00" // Refactored to use MovingAverage_Engine
 #property description "Professional Chaikin Oscillator (CHO) with selectable MA type and"
 #property description "candle source (Standard or Heikin Ashi) for the underlying ADL."
 
@@ -32,64 +30,54 @@ enum ENUM_CANDLE_SOURCE
 //--- Input Parameters ---
 input int                 InpFastPeriod   = 3;
 input int                 InpSlowPeriod   = 10;
-input ENUM_MA_METHOD      InpMaMethod     = MODE_EMA;
+// UPDATED: Use ENUM_MA_TYPE
+input ENUM_MA_TYPE        InpMaMethod     = EMA;
 input ENUM_APPLIED_VOLUME InpVolumeType   = VOLUME_TICK;
 input ENUM_CANDLE_SOURCE  InpCandleSource = CANDLE_STANDARD; // Candle source for ADL
 
 //--- Indicator Buffers ---
 double    BufferCHO[];
 
-//--- Global calculator object (as a base class pointer) ---
+//--- Global calculator object ---
 CCHOCalculator *g_calculator;
 
-//+------------------------------------------------------------------+
-//| Custom indicator initialization function.                        |
 //+------------------------------------------------------------------+
 int OnInit()
   {
-//--- Map the buffer and set as non-timeseries
    SetIndexBuffer(0, BufferCHO, INDICATOR_DATA);
    ArraySetAsSeries(BufferCHO, false);
 
-//--- Dynamically create the appropriate calculator instance
    switch(InpCandleSource)
      {
       case CANDLE_HEIKIN_ASHI:
          g_calculator = new CCHOCalculator_HA();
-         IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CHO HA(%d,%d)", InpFastPeriod, InpSlowPeriod));
+         IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CHO HA(%d,%d,%s)", InpFastPeriod, InpSlowPeriod, EnumToString(InpMaMethod)));
          break;
-      default: // CANDLE_STANDARD
+      default:
          g_calculator = new CCHOCalculator_Std();
-         IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CHO(%d,%d)", InpFastPeriod, InpSlowPeriod));
+         IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("CHO(%d,%d,%s)", InpFastPeriod, InpSlowPeriod, EnumToString(InpMaMethod)));
          break;
      }
 
-//--- Check if creation was successful and initialize
    if(CheckPointer(g_calculator) == POINTER_INVALID || !g_calculator.Init(InpFastPeriod, InpSlowPeriod, InpMaMethod, InpVolumeType))
      {
       Print("Failed to create or initialize CHO Calculator object.");
       return(INIT_FAILED);
      }
 
-//--- Set indicator display properties
    PlotIndexSetInteger(0, PLOT_DRAW_BEGIN, g_calculator.GetSlowPeriod() - 1);
    IndicatorSetInteger(INDICATOR_DIGITS, 0);
 
    return(INIT_SUCCEEDED);
   }
 
-//+------------------------------------------------------------------+
-//| Custom indicator deinitialization function.                      |
 //+------------------------------------------------------------------+
 void OnDeinit(const int reason)
   {
-//--- Free the calculator object to prevent memory leaks
    if(CheckPointer(g_calculator) != POINTER_INVALID)
       delete g_calculator;
   }
 
-//+------------------------------------------------------------------+
-//| Custom indicator calculation function.                           |
 //+------------------------------------------------------------------+
 int OnCalculate(const int rates_total,
                 const int prev_calculated,
@@ -102,16 +90,12 @@ int OnCalculate(const int rates_total,
                 const long &volume[],
                 const int &spread[])
   {
-//--- Ensure the calculator object is valid
    if(CheckPointer(g_calculator) == POINTER_INVALID)
       return 0;
 
-//--- Delegate the entire calculation to our calculator object
-//--- CORRECTED: Pass the 'open' array to the calculator
-   g_calculator.Calculate(rates_total, open, high, low, close, tick_volume, volume, BufferCHO);
+// Delegate calculation with incremental optimization
+   g_calculator.Calculate(rates_total, prev_calculated, open, high, low, close, tick_volume, volume, InpVolumeType, BufferCHO);
 
-//--- Return rates_total for a full recalculation, ensuring stability
    return(rates_total);
   }
 //+------------------------------------------------------------------+
-//+------------------------------------------------------------------+