Moves Indicator and IndicatorBase into Indicator/

EA31337 · Aug 8, 2022 · d0b8d22 · d0b8d22
1 parent ec62fc0
commit d0b8d22
Show file tree

Hide file tree

Showing 97 changed files with 137 additions and 136 deletions.
diff --git a/.github/workflows/test-indicator.yml b/.github/workflows/test-indicator.yml
@@ -51,6 +51,7 @@ jobs:
       matrix:
         test:
           - IndicatorCandle.test
+          - Indicator.test
           - IndicatorTf.test
           - IndicatorTick.test
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -60,7 +60,6 @@ jobs:
           - DatabaseTest
           - DrawIndicatorTest
           - EATest
-          - IndicatorTest
           - IndicatorsTest
           - MailTest
           - MarketTest

diff --git a/Account/AccountMt.h b/Account/AccountMt.h
@@ -33,7 +33,7 @@ class AccountMt;
 #include "../Chart.mqh"
 #include "../Convert.mqh"
 #include "../Data.struct.h"
-#include "../Indicator.struct.h"
+#include "../Indicator/Indicator.struct.h"
 #include "../Order.struct.h"
 #include "../Orders.mqh"
 #include "../Serializer.mqh"

diff --git a/BufferFXT.mqh b/BufferFXT.mqh
@@ -27,7 +27,7 @@
 #include "Account/AccountMt.h"
 #include "Chart.mqh"
 #include "DictStruct.mqh"
-#include "IndicatorBase.h"
+#include "Indicator/IndicatorBase.h"
 #include "Object.mqh"
 
 // Defines.

diff --git a/Indicator.define.h → Indicator/Indicator.define.h b/Indicator.define.h → Indicator/Indicator.define.h
diff --git a/Indicator.enum.h → Indicator/Indicator.enum.h b/Indicator.enum.h → Indicator/Indicator.enum.h
diff --git a/Indicator.mqh → Indicator/Indicator.h b/Indicator.mqh → Indicator/Indicator.h
@@ -25,27 +25,27 @@
 #define INDICATOR_MQH
 
 // Includes.
-#include "Array.mqh"
-#include "BufferStruct.mqh"
-#include "DateTime.mqh"
-#include "DrawIndicator.mqh"
-#include "Flags.h"
+#include "../Array.mqh"
+#include "../BufferStruct.mqh"
+#include "../DateTime.mqh"
+#include "../DrawIndicator.mqh"
+#include "../Flags.h"
+#include "../Math.h"
+#include "../Object.mqh"
+#include "../Refs.mqh"
+#include "../Serializer.mqh"
+#include "../SerializerCsv.mqh"
+#include "../SerializerJson.mqh"
+#include "../Storage/ValueStorage.h"
+#include "../Storage/ValueStorage.indicator.h"
+#include "../Storage/ValueStorage.native.h"
 #include "Indicator.define.h"
 #include "Indicator.enum.h"
 #include "Indicator.struct.cache.h"
 #include "Indicator.struct.h"
 #include "Indicator.struct.serialize.h"
 #include "Indicator.struct.signal.h"
 #include "IndicatorBase.h"
-#include "Math.h"
-#include "Object.mqh"
-#include "Refs.mqh"
-#include "Serializer.mqh"
-#include "SerializerCsv.mqh"
-#include "SerializerJson.mqh"
-#include "Storage/ValueStorage.h"
-#include "Storage/ValueStorage.indicator.h"
-#include "Storage/ValueStorage.native.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compatibility).

diff --git a/Indicator.struct.cache.h → Indicator/Indicator.struct.cache.h b/Indicator.struct.cache.h → Indicator/Indicator.struct.cache.h
@@ -31,8 +31,8 @@
 #endif
 
 // Includes.
-#include "Refs.mqh"
-#include "Storage/ValueStorage.h"
+#include "../Refs.mqh"
+#include "../Storage/ValueStorage.h"
 
 /**
  * Holds buffers used to cache values calculated via OnCalculate methods.

diff --git a/Indicator.struct.h → Indicator/Indicator.struct.h b/Indicator.struct.h → Indicator/Indicator.struct.h
@@ -36,14 +36,14 @@ class Indicator;
 struct ChartParams;
 
 // Includes.
-#include "Array.mqh"
-#include "Chart.struct.tf.h"
-#include "Data.struct.h"
-#include "DateTime.struct.h"
+#include "../Array.mqh"
+#include "../Chart.struct.tf.h"
+#include "../Data.struct.h"
+#include "../DateTime.struct.h"
+#include "../SerializerNode.enum.h"
+#include "../Storage/ValueStorage.indicator.h"
 #include "Indicator.enum.h"
 #include "Indicator.struct.cache.h"
-#include "SerializerNode.enum.h"
-#include "Storage/ValueStorage.indicator.h"
 
 // Type-less value for IndicatorDataEntryValue structure.
 union IndicatorDataEntryTypelessValue {

diff --git a/Indicator.struct.serialize.h → Indicator/Indicator.struct.serialize.h b/Indicator.struct.serialize.h → Indicator/Indicator.struct.serialize.h
@@ -25,7 +25,7 @@
  * Includes Indicator's struct serializers.
  */
 
-#include "Serializer.mqh"
+#include "../Serializer.mqh"
 
 // Forward class declaration.
 class Serializer;

diff --git a/Indicator.struct.signal.h → Indicator/Indicator.struct.signal.h b/Indicator.struct.signal.h → Indicator/Indicator.struct.signal.h
diff --git a/IndicatorBase.h → Indicator/IndicatorBase.h b/IndicatorBase.h → Indicator/IndicatorBase.h
@@ -34,31 +34,31 @@
 class Chart;
 
 // Includes.
-#include "Array.mqh"
-#include "BufferStruct.mqh"
-#include "Chart.mqh"
-#include "Chart.struct.tf.h"
-#include "ChartBase.h"
-#include "ChartMt.h"
-#include "DateTime.mqh"
-#include "DrawIndicator.mqh"
-#include "Flags.h"
+#include "../Array.mqh"
+#include "../BufferStruct.mqh"
+#include "../Chart.mqh"
+#include "../Chart.struct.tf.h"
+#include "../ChartBase.h"
+#include "../ChartMt.h"
+#include "../DateTime.mqh"
+#include "../DrawIndicator.mqh"
+#include "../Flags.h"
+#include "../Log.mqh"
+#include "../Object.mqh"
+#include "../Refs.mqh"
+#include "../Serializer.mqh"
+#include "../SerializerCsv.mqh"
+#include "../SerializerJson.mqh"
+#include "../Storage/ValueStorage.h"
+#include "../Storage/ValueStorage.indicator.h"
+#include "../Storage/ValueStorage.native.h"
+#include "../Util.h"
 #include "Indicator.define.h"
 #include "Indicator.enum.h"
 #include "Indicator.struct.cache.h"
 #include "Indicator.struct.h"
 #include "Indicator.struct.serialize.h"
 #include "Indicator.struct.signal.h"
-#include "Log.mqh"
-#include "Object.mqh"
-#include "Refs.mqh"
-#include "Serializer.mqh"
-#include "SerializerCsv.mqh"
-#include "SerializerJson.mqh"
-#include "Storage/ValueStorage.h"
-#include "Storage/ValueStorage.indicator.h"
-#include "Storage/ValueStorage.native.h"
-#include "Util.h"
 
 /**
  * Class to deal with indicators.

diff --git a/Indicator/IndicatorCandle.h b/Indicator/IndicatorCandle.h
@@ -32,14 +32,14 @@
 // Includes.
 #include "../Buffer/BufferCandle.h"
 #include "../Candle.struct.h"
-#include "../Indicator.mqh"
 #include "../Storage/ValueStorage.price_median.h"
 #include "../Storage/ValueStorage.price_typical.h"
 #include "../Storage/ValueStorage.price_weighted.h"
 #include "../Storage/ValueStorage.spread.h"
 #include "../Storage/ValueStorage.tick_volume.h"
 #include "../Storage/ValueStorage.time.h"
 #include "../Storage/ValueStorage.volume.h"
+#include "Indicator.h"
 #include "TickBarCounter.h"
 
 // Indicator modes.

diff --git a/Indicator/IndicatorTf.struct.h b/Indicator/IndicatorTf.struct.h
@@ -31,7 +31,7 @@
 #endif
 
 // Includes.
-#include "../Indicator.struct.h"
+#include "Indicator.struct.h"
 
 /* Structure for IndicatorTf class parameters. */
 struct IndicatorTfParams : IndicatorParams {

diff --git a/Indicator/IndicatorTick.h b/Indicator/IndicatorTick.h
@@ -31,8 +31,8 @@
 
 // Includes.
 #include "../Buffer/BufferTick.h"
-#include "../Indicator.mqh"
-#include "../Indicator.struct.h"
+#include "Indicator.h"
+#include "Indicator.struct.h"
 
 // Indicator modes.
 enum ENUM_INDI_TICK_MODE {

diff --git a/Indicator/IndicatorTickSource.h b/Indicator/IndicatorTickSource.h
@@ -26,7 +26,7 @@
 #endif
 
 // Includes.
-#include "../Indicator.mqh"
+#include "Indicator.h"
 
 /**
  * Indicator to be used with IndicatorTick as a data source.

diff --git a/tests/IndicatorTest.mq4 → Indicator/tests/Indicator.test.mq4 b/tests/IndicatorTest.mq4 → Indicator/tests/Indicator.test.mq4
@@ -1,6 +1,6 @@
 //+------------------------------------------------------------------+
 //|                                                EA31337 framework |
-//|                                 Copyright 2016-2021, EA31337 Ltd |
+//|                                 Copyright 2016-2022, EA31337 Ltd |
 //|                                       https://github.com/EA31337 |
 //+------------------------------------------------------------------+
 
@@ -25,4 +25,4 @@
  */
 
 // Includes.
-#include "IndicatorTest.mq5"
+#include "Indicator.test.mq5"
diff --git a/tests/IndicatorTest.mq5 → Indicator/tests/Indicator.test.mq5 b/tests/IndicatorTest.mq5 → Indicator/tests/Indicator.test.mq5
@@ -1,6 +1,6 @@
 //+------------------------------------------------------------------+
 //|                                                EA31337 framework |
-//|                                 Copyright 2016-2021, EA31337 Ltd |
+//|                                 Copyright 2016-2022, EA31337 Ltd |
 //|                                       https://github.com/EA31337 |
 //+------------------------------------------------------------------+
 
@@ -25,8 +25,8 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
-#include "../Test.mqh"
+#include "../Indicator.h"
+#include "../../Test.mqh"
 
 /**
  * Implements OnInit().

diff --git a/Indicator/tests/classes/Indicators.h b/Indicator/tests/classes/Indicators.h
@@ -30,7 +30,7 @@
 #endif
 
 // Includes.
-#include "../../../IndicatorBase.h"
+#include "../../../Indicator/IndicatorBase.h"
 #include "../../../Refs.mqh"
 
 /**

diff --git a/Indicators/Bitwise/Indi_Candle.mqh b/Indicators/Bitwise/Indi_Candle.mqh
@@ -23,7 +23,7 @@
 // Includes.
 #include "../../Bar.struct.h"
 #include "../../BufferStruct.mqh"
-#include "../../Indicator.mqh"
+#include "../../Indicator/Indicator.h"
 #include "../../Pattern.struct.h"
 #include "../../Serializer.mqh"
 #include "../Price/Indi_Price.mqh"

diff --git a/Indicators/Bitwise/Indi_Pattern.mqh b/Indicators/Bitwise/Indi_Pattern.mqh
@@ -23,7 +23,7 @@
 // Includes.
 #include "../../Bar.struct.h"
 #include "../../BufferStruct.mqh"
-#include "../../Indicator.mqh"
+#include "../../Indicator/Indicator.h"
 #include "../../Pattern.struct.h"
 #include "../../Serializer.mqh"
 #include "../Price/Indi_Price.mqh"

diff --git a/Indicators/Indi_AC.mqh b/Indicators/Indi_AC.mqh
@@ -22,7 +22,7 @@
 
 // Includes.
 #include "../BufferStruct.mqh"
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compability).

diff --git a/Indicators/Indi_AD.mqh b/Indicators/Indi_AD.mqh
@@ -21,7 +21,7 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compability).

diff --git a/Indicators/Indi_ADX.mqh b/Indicators/Indi_ADX.mqh
@@ -21,7 +21,7 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 #include "Price/Indi_Price.mqh"
 
 #ifndef __MQL4__

diff --git a/Indicators/Indi_ADXW.mqh b/Indicators/Indi_ADXW.mqh
@@ -22,7 +22,7 @@
 
 // Includes.
 #include "../BufferStruct.mqh"
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 #include "../Storage/ValueStorage.applied_price.h"
 #include "../Storage/ValueStorage.h"
 #include "../Storage/ValueStorage.spread.h"

diff --git a/Indicators/Indi_AMA.mqh b/Indicators/Indi_AMA.mqh
@@ -22,7 +22,7 @@
 
 // Includes.
 #include "../BufferStruct.mqh"
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 #include "../Indicator/tests/classes/IndicatorTfDummy.h"
 #include "../Storage/ValueStorage.h"
 #include "Price/Indi_Price.mqh"

diff --git a/Indicators/Indi_AO.mqh b/Indicators/Indi_AO.mqh
@@ -21,7 +21,7 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compability).

diff --git a/Indicators/Indi_ASI.mqh b/Indicators/Indi_ASI.mqh
@@ -22,7 +22,7 @@
 
 // Includes.
 #include "../BufferStruct.mqh"
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 #include "../Storage/ValueStorage.all.h"
 
 // Structs.

diff --git a/Indicators/Indi_ATR.mqh b/Indicators/Indi_ATR.mqh
@@ -21,7 +21,7 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compability).

diff --git a/Indicators/Indi_Alligator.mqh b/Indicators/Indi_Alligator.mqh
@@ -21,7 +21,7 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compability).

diff --git a/Indicators/Indi_AppliedPrice.mqh b/Indicators/Indi_AppliedPrice.mqh
@@ -22,7 +22,7 @@
 
 // Includes.
 #include "../BufferStruct.mqh"
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 #include "OHLC/Indi_OHLC.mqh"
 
 // Structs.

diff --git a/Indicators/Indi_BWMFI.mqh b/Indicators/Indi_BWMFI.mqh
@@ -21,7 +21,7 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compability).

diff --git a/Indicators/Indi_Bands.mqh b/Indicators/Indi_Bands.mqh
@@ -21,7 +21,7 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 #include "Indi_CCI.mqh"
 #include "Indi_Envelopes.mqh"
 #include "Indi_MA.mqh"

diff --git a/Indicators/Indi_BearsPower.mqh b/Indicators/Indi_BearsPower.mqh
@@ -21,7 +21,7 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compability).

diff --git a/Indicators/Indi_BullsPower.mqh b/Indicators/Indi_BullsPower.mqh
@@ -21,7 +21,7 @@
  */
 
 // Includes.
-#include "../Indicator.mqh"
+#include "../Indicator/Indicator.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compability).