Merge remote-tracking branch 'origin/v3.004-dev' into v3.007-dev-new

* origin/v3.004-dev: (42 commits) Improves Fibonacci calculation for Pivot Indicators: Renames some variables to avoid global variable conflict Indi_ADXW: Fixes logic for SetCustomIndicatorName() ADXW: Renames variables to avoid global conflicts Indi_ADXW: Fixes logic for SetCustomIndicatorName() ADXW: Renames variables to avoid global conflicts Little changes for array #defines. WIP. Added rates_total validation for all the indicators in `Indicators` folder. WIP. Fixing MQL/C++ errors. Moving serialization methods to separate files. WIP. Fixing C++ include loops. WIP. Fixing C++ errors. WIP. Adding candle invalidation. Still not working. Required for IndicatorCandle test. WIP. Fixing tests. WIP. Indi_Bands now uses OnCalculate() method. Fixing shifts in all the indicators. WIP. Shift parameters refactoring for Indicator/IndicatorData/other classes. Still some errors. WIP. Added explanation of shift parameters in Indicator/IndicatorData classes for following methods: GetEntryValue/GetEntryAlter/GetValue/GetEntry(). WIP. Fixing inconsistencies in shift given into indicators' params and the one passed to GetEntry/GetEntryAlter(). Also adding requirement of minimum bars for OnCalculate based indicators. WIP. Looks like indicators' custom buffer requires refactoring and use ItemsHistory class instead of BufferStruct. We'll try to fix other tests before another refactor. WIP. Fixing indicator tests. WIP. Fixing indicators that depends on candles that not yet occured. ...
EA31337 · May 3, 2024 · 3d8ee86 · 3d8ee86
2 parents 82244e2 + 7b292b7
commit 3d8ee86
Show file tree

Hide file tree

Showing 234 changed files with 5,177 additions and 3,493 deletions.
diff --git a/.github/workflows/test-indicator.yml b/.github/workflows/test-indicator.yml
@@ -35,9 +35,13 @@ jobs:
     strategy:
       matrix:
         test:
+          - Indicator.test
+          - IndicatorBase.test
           - IndicatorCandle.test
+          - IndicatorData.test
           - IndicatorTf.test
           - IndicatorTick.test
+          - IndicatorRenko.test
     steps:
       - uses: actions/download-artifact@v2
         with:

diff --git a/.github/workflows/test-indicators.yml b/.github/workflows/test-indicators.yml
@@ -57,7 +57,6 @@ jobs:
           - Indi_ColorCandlesDaily.test
           - Indi_ColorLine.test
           - Indi_CustomMovingAverage.test
-          - Indi_DEMA.test
           - Indi_DeMarker.test
           - Indi_Demo.test
           - Indi_DetrendedPrice.test
@@ -101,6 +100,8 @@ jobs:
           - Indi_WilliamsAD.test
           - Indi_ZigZag.test
           - Indi_ZigZagColor.test
+          # Requires refactoring:
+          # - Indi_DEMA.test
     steps:
       - uses: actions/download-artifact@v2
         with:

diff --git a/.github/workflows/test-serializer.yml b/.github/workflows/test-serializer.yml
@@ -0,0 +1,49 @@
+---
+name: Test Serializer
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    paths:
+      - 'Serializer/**'
+      - '.github/workflows/test-serializer.yml'
+  push:
+    paths:
+      - 'Serializer/**'
+      - '.github/workflows/test-serializer.yml'
+
+jobs:
+
+  compile:
+    name: Compile
+    uses: ./.github/workflows/compile.yml
+    with:
+      artifact_prefix: mt
+      path: Exchange
+      skip_cleanup: true
+
+  Serializer-Tests-MQL4:
+    defaults:
+      run:
+        shell: bash
+        working-directory: serializer/tests
+    needs: compile
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test:
+          - Serializer.test
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: files-ex4
+      - name: Run ${{ matrix.test }}
+        uses: fx31337/mql-tester-action@master
+        with:
+          BtDays: 4-8
+          BtMonths: 1
+          BtYears: 2021
+          MtVersion: 4.0.0.1359
+          RunOnError: show_logs 200
+          TestExpert: ${{ matrix.test }}
+    timeout-minutes: 10
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -46,7 +46,6 @@ jobs:
           - DatabaseTest
           # - DrawIndicatorTest
           - EATest
-          - IndicatorTest
           - IndicatorsTest
           - MailTest
           - MarketTest
@@ -98,7 +97,6 @@ jobs:
           - OrderQuery
           - ProfilerTest
           - RefsTest
-          - SerializerTest
           - TerminalTest
           - TimerTest
           - ValueStorageTest

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,4 +1,5 @@
 ---
+exclude: '\.md$'
 repos:
 
   - repo: https://github.com/pre-commit/pre-commit-hooks

diff --git a/3D/Chart3D.h b/3D/Chart3D.h
@@ -26,12 +26,12 @@
  */
 
 #include "../Bar.struct.h"
-#include "../IndicatorData.mqh"
+#include "../Indicator/IndicatorData.h"
 #include "../Indicators/Indi_MA.mqh"
 #include "../Instances.h"
 #include "../Refs.mqh"
-#include "../SerializerConverter.mqh"
-#include "../SerializerJson.mqh"
+#include "../Serializer/SerializerConverter.h"
+#include "../Serializer/SerializerJson.h"
 #include "Chart3DCandles.h"
 #include "Chart3DType.h"
 #include "Cube.h"

diff --git a/Account/Account.h b/Account/Account.h
@@ -26,7 +26,7 @@
 
 // Includes.
 #include "../BufferStruct.mqh"
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "AccountBase.h"
 
 /**

diff --git a/Account/Account.struct.h b/Account/Account.struct.h
@@ -35,7 +35,7 @@
 class Serializer;
 
 // Includes.
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "../Terminal.define.h"
 
 // Struct for account entries.

diff --git a/Account/AccountBase.h b/Account/AccountBase.h
@@ -25,7 +25,6 @@
 #define ACCOUNTBASE_H
 
 // Includes.
-//#include "../Serializer.mqh"
 #include "../Refs.mqh"
 #include "AccountBase.struct.h"
 

diff --git a/Account/AccountBase.struct.h b/Account/AccountBase.struct.h
@@ -35,7 +35,7 @@
 class Serializer;
 
 // Includes.
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "../Terminal.define.h"
 
 // Struct for account entries.

diff --git a/Account/AccountForex.h b/Account/AccountForex.h
@@ -25,7 +25,7 @@
 #define ACCOUNTFOREX_H
 
 // Includes.
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "Account.h"
 #include "AccountForex.struct.h"
 

diff --git a/Account/AccountForex.struct.h b/Account/AccountForex.struct.h
@@ -35,7 +35,7 @@
 class Serializer;
 
 // Includes.
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "../Terminal.define.h"
 
 // Struct for account entries.

diff --git a/Account/AccountMt.h b/Account/AccountMt.h
@@ -30,13 +30,12 @@ class AccountMt;
 // Includes.
 #include "../Array.mqh"
 #include "../BufferStruct.mqh"
-#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"
+#include "../Serializer/Serializer.h"
 #include "../SymbolInfo.mqh"
 #include "../Trade.struct.h"
 #include "Account.define.h"