Removes CustomMovingAverage indicator in favor of MA

EA31337 · Jun 25, 2023 · 6e2b81f · 6e2b81f
1 parent 1ece853
commit 6e2b81f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 203 deletions.
diff --git a/.github/workflows/test-indicators.yml b/.github/workflows/test-indicators.yml
@@ -66,7 +66,6 @@ jobs:
           - Indi_CCI.test
           - Indi_CHO.test
           - Indi_CHV.test
-          - Indi_CustomMovingAverage.test
           - Indi_DeMarker.test
           - Indi_Demo.test
           - Indi_DetrendedPrice.test

diff --git a/Indicators/Indi_CustomMovingAverage.mqh b/Indicators/Indi_CustomMovingAverage.mqh
diff --git a/Indicators/Price/Indi_MA.h b/Indicators/Price/Indi_MA.h
@@ -76,8 +76,14 @@ struct IndiMAParams : IndicatorParams {
   IndiMAParams(unsigned int _period = 13, int _ma_shift = 0, ENUM_MA_METHOD _ma_method = MODE_SMA,
                ENUM_APPLIED_PRICE _ap = PRICE_OPEN, int _shift = 10)
       : period(_period), ma_shift(_ma_shift), ma_method(_ma_method), applied_array(_ap), IndicatorParams(INDI_MA) {
+    if (custom_indi_name == "") {
+#ifdef __MQL5__
+      SetCustomIndicatorName("Examples\\Custom Moving Average");
+#else
+      SetCustomIndicatorName("Custom Moving Averages");
+#endif
+    }
     shift = _shift;
-    SetCustomIndicatorName("Examples\\Moving Average");
   };
   IndiMAParams(IndiMAParams &_params) { THIS_REF = _params; };
 };
@@ -674,13 +680,15 @@ class Indi_MA : public Indicator<IndiMAParams> {
         break;
       case IDATA_ICUSTOM:
         _value = iCustom(istate.handle, GetSymbol(), GetTf(), iparams.custom_indi_name, /* [ */ GetPeriod(),
-                         GetMAShift(), GetMAMethod(), GetAppliedPrice() /* ] */, 0, ToRelShift(_abs_shift));
+                         GetMAShift(), GetMAMethod() /* ] */, 0, ToRelShift(_abs_shift));
         break;
       case IDATA_INDICATOR:
         // Calculating MA value from specified indicator.
         _value = Indi_MA::iMAOnIndicator(THIS_PTR, GetDataSource(), GetSymbol(), GetTf(), GetPeriod(), GetMAShift(),
                                          GetMAMethod(), GetAppliedPrice(), ToRelShift(_abs_shift));
         break;
+      default:
+        SetUserError(ERR_INVALID_PARAMETER);
     }
 
     return _value;

diff --git a/Indicators/includes.h b/Indicators/includes.h
@@ -41,7 +41,6 @@
 #include "Indi_CCI.mqh"
 #include "Indi_CHO.mqh"
 #include "Indi_CHV.mqh"
-#include "Indi_CustomMovingAverage.mqh"
 #include "Indi_DEMA.mqh"
 #include "Indi_DeMarker.mqh"
 #include "Indi_Demo.mqh"

diff --git a/Indicators/tests/Indi_CustomMovingAverage.test.mq4 b/Indicators/tests/Indi_CustomMovingAverage.test.mq4
diff --git a/Indicators/tests/Indi_CustomMovingAverage.test.mq5 b/Indicators/tests/Indi_CustomMovingAverage.test.mq5
diff --git a/tests/IndicatorsTest.mq5 b/tests/IndicatorsTest.mq5
@@ -517,10 +517,6 @@ bool InitIndicators() {
   IndiZigZagColorParams zigzag_color_params();
   indis.Add(new Indi_ZigZagColor(zigzag_color_params));
 
-  // Custom Moving Average.
-  IndiCustomMovingAverageParams cma_params();
-  indis.Add(new Indi_CustomMovingAverage(cma_params));
-
   // Math (specialized indicator).
   IndiMathParams math_params(MATH_OP_SUB, BAND_UPPER, BAND_LOWER, 0, 0);
   // math_params.SetPlot(clrBlue); // @fixme