Merge pull request #70 from EA31337/v2.000-dev

New V2 strategies and enhancements
EA31337 · Sep 10, 2023 · 5ec8b7e · 5ec8b7e
2 parents b25f2c6 + 744103a
commit 5ec8b7e
Show file tree

Hide file tree

Showing 73 changed files with 544 additions and 97 deletions.
diff --git a/.github/Test.mq4 b/.github/Test.mq4
@@ -1,6 +1,6 @@
 //+------------------------------------------------------------------+
 //|                  EA31337 - multi-strategy advanced trading robot |
-//|                                 Copyright 2016-2021, EA31337 Ltd |
+//|                                 Copyright 2016-2023, EA31337 Ltd |
 //|                                       https://github.com/EA31337 |
 //+------------------------------------------------------------------+
 

diff --git a/.github/Test.mq5 b/.github/Test.mq5
@@ -1,6 +1,6 @@
 //+------------------------------------------------------------------+
 //|                  EA31337 - multi-strategy advanced trading robot |
-//|                                 Copyright 2016-2021, EA31337 Ltd |
+//|                                 Copyright 2016-2023, EA31337 Ltd |
 //|                                       https://github.com/EA31337 |
 //+------------------------------------------------------------------+
 
@@ -24,11 +24,11 @@
 #include <EA31337-classes/Pattern.mqh>
 
 // Includes indicator classes.
-#include <EA31337-classes/Indicators/indicators.h>
 #include <EA31337-classes/Indicators/Bitwise/indicators.h>
 #include <EA31337-classes/Indicators/OHLC/indicators.h>
 #include <EA31337-classes/Indicators/Price/indicators.h>
 #include <EA31337-classes/Indicators/Special/indicators.h>
+#include <EA31337-classes/Indicators/indicators.h>
 
 // Local includes.
 #include "../enum.h"

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -13,11 +13,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: actions/cache@v1
+      - uses: actions/cache@v3
         with:
           path: ~/.cache/pre-commit
           key: pre-commit|${{ hashFiles('.pre-commit-config.yaml') }}
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: 3.9
-      - uses: pre-commit/action@v2.0.3
+      - uses: pre-commit/action@v3.0.0
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -6,15 +6,15 @@ on:
   pull_request:
     branches:
       - 'master'
-      - 'dev*'
+      - '*dev*'
     paths-ignore:
       - '*.md'
       - '.git*'
       - 'docs/**'
   push:
     branches:
       - 'master'
-      - 'dev*'
+      - '*dev*'
     paths-ignore:
       - '*.md'
       - '.git*'
@@ -55,14 +55,28 @@ jobs:
           - Ichimoku
           - Indicator
           - MA
+          - MA_Cross_Pivot
+          - MA_Cross_Shift
+          - MA_Cross_Sup_Res
           - MACD
           - MFI
+          - Meta_Mirror
+          - Meta_Multi
+          - Meta_Reversal
           - Momentum
           - OBV
           - OsMA
+          - Oscillator
+          - Oscillator_Divergence
+          - Oscillator_Multi
+          - Oscillator_Cross
+          - Oscillator_Cross_Shift
+          - Oscillator_Cross_Zero
+          - Oscillator_Range
           - Pattern
           - Pinbar
           - Pivot
+          - Retracement
           - RSI
           - RVI
           - SAR
@@ -84,8 +98,15 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: Include/EA31337-classes
-          ref: v2.013
+          ref: v3.000.1
           repository: EA31337/EA31337-classes
+      - uses: actions/checkout@v2
+        if: ${{ startsWith(matrix.name, 'Meta_') }}
+        with:
+          path: Include/EA31337-strategies
+          ref: v2.000-dev
+          repository: EA31337/EA31337-strategies
+          submodules: recursive
       - name: Enables input mode
         run: echo '#define __input__' > ./${{ matrix.name }}/config/define.h
       - name: Compile for MQL4
@@ -117,7 +138,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: Include/EA31337-classes
-          ref: v2.013
+          ref: v3.000.1
           repository: EA31337/EA31337-classes
       - name: Compile for MQL4
         uses: fx31337/mql-compile-action@master

diff --git a/.gitmodules b/.gitmodules
@@ -22,6 +22,9 @@
 [submodule "Alligator"]
 	path = Alligator
 	url = https://github.com/EA31337/Strategy-Alligator.git
+[submodule "Arrows"]
+	path = Arrows
+	url = https://github.com/EA31337/Strategy-Arrows.git
 [submodule "Awesome"]
 	path = Awesome
 	url = https://github.com/EA31337/Strategy-Awesome.git
@@ -52,6 +55,9 @@
 [submodule "DeMarker"]
 	path = DeMarker
 	url = https://github.com/EA31337/Strategy-DeMarker.git
+[submodule "DPO"]
+	path = DPO
+	url = https://github.com/EA31337/Strategy-DPO.git
 [submodule "ElliottWave"]
 	path = ElliottWave
 	url = https://github.com/EA31337/Strategy-ElliottWave.git
@@ -79,21 +85,60 @@
 [submodule "MA"]
 	path = MA
 	url = https://github.com/EA31337/Strategy-MA.git
+[submodule "MA_Cross_Pivot"]
+	path = MA_Cross_Pivot
+	url = https://github.com/EA31337/Strategy-MA_Cross_Pivot.git
+[submodule "MA_Cross_Shift"]
+	path = MA_Cross_Shift
+	url = https://github.com/EA31337/Strategy-MA_Cross_Shift.git
+[submodule "MA_Cross_Sup_Res"]
+	path = MA_Cross_Sup_Res
+	url = https://github.com/EA31337/Strategy-MA_Cross_Sup_Res.git
 [submodule "MACD"]
 	path = MACD
 	url = https://github.com/EA31337/Strategy-MACD.git
-[submodule "MFI"]
-	path = MFI
-	url = https://github.com/EA31337/Strategy-MFI.git
+[submodule "Meta_Mirror"]
+	path = Meta_Mirror
+	url = https://github.com/EA31337/Strategy-Meta_Mirror.git
+[submodule "Meta_Multi"]
+	path = Meta_Multi
+	url = https://github.com/EA31337/Strategy-Meta_Multi.git
+[submodule "Meta_Reversal"]
+	path = Meta_Reversal
+	url = https://github.com/EA31337/Strategy-Meta_Reversal.git
 [submodule "Momentum"]
 	path = Momentum
 	url = https://github.com/EA31337/Strategy-Momentum.git
+[submodule "MFI"]
+	path = MFI
+	url = https://github.com/EA31337/Strategy-MFI.git
 [submodule "OBV"]
 	path = OBV
 	url = https://github.com/EA31337/Strategy-OBV.git
 [submodule "OsMA"]
 	path = OsMA
 	url = https://github.com/EA31337/Strategy-OsMA.git
+[submodule "Oscillator"]
+	path = Oscillator
+	url = https://github.com/EA31337/Strategy-Oscillator.git
+[submodule "Oscillator_Cross"]
+	path = Oscillator_Cross
+	url = https://github.com/EA31337/Strategy-Oscillator_Cross.git
+[submodule "Oscillator_Cross_Shift"]
+	path = Oscillator_Cross_Shift
+	url = https://github.com/EA31337/Strategy-Oscillator_Cross_Shift.git
+[submodule "Oscillator_Cross_Zero"]
+	path = Oscillator_Cross_Zero
+	url = https://github.com/EA31337/Strategy-Oscillator_Cross_Zero.git
+[submodule "Oscillator_Divergence"]
+	path = Oscillator_Divergence
+	url = https://github.com/EA31337/Strategy-Oscillator_Divergence.git
+[submodule "Oscillator_Multi"]
+	path = Oscillator_Multi
+	url = https://github.com/EA31337/Strategy-Oscillator_Multi.git
+[submodule "Oscillator_Range"]
+	path = Oscillator_Range
+	url = https://github.com/EA31337/Strategy-Oscillator_Range.git
 [submodule "Pattern"]
 	path = Pattern
 	url = https://github.com/EA31337/Strategy-Pattern.git
@@ -103,6 +148,9 @@
 [submodule "Pivot"]
 	path = Pivot
 	url = https://github.com/EA31337/Strategy-Pivot.git
+[submodule "Retracement"]
+	path = Retracement
+	url = https://github.com/EA31337/Strategy-Retracement.git
 [submodule "RSI"]
 	path = RSI
 	url = https://github.com/EA31337/Strategy-RSI.git

diff --git a/AC b/AC
diff --git a/AD b/AD
diff --git a/ADX b/ADX
diff --git a/AMA b/AMA
diff --git a/ASI b/ASI
diff --git a/ATR b/ATR
diff --git a/ATR_MA_Trend b/ATR_MA_Trend
diff --git a/Alligator b/Alligator
diff --git a/Arrows b/Arrows
diff --git a/Awesome b/Awesome
diff --git a/BWMFI b/BWMFI
diff --git a/Bands b/Bands
diff --git a/BearsPower b/BearsPower
diff --git a/BullsPower b/BullsPower
diff --git a/CCI b/CCI
diff --git a/Chaikin b/Chaikin
diff --git a/DEMA b/DEMA
diff --git a/DPO b/DPO
diff --git a/DeMarker b/DeMarker
diff --git a/Demo b/Demo
diff --git a/ElliottWave b/ElliottWave
diff --git a/Envelopes b/Envelopes
diff --git a/Force b/Force
diff --git a/Fractals b/Fractals
diff --git a/Gator b/Gator
diff --git a/HeikenAshi b/HeikenAshi
diff --git a/Ichimoku b/Ichimoku
diff --git a/Indicator b/Indicator
diff --git a/MA b/MA
diff --git a/MACD b/MACD
diff --git a/MA_Cross_Pivot b/MA_Cross_Pivot
diff --git a/MA_Cross_Shift b/MA_Cross_Shift
diff --git a/MA_Cross_Sup_Res b/MA_Cross_Sup_Res
diff --git a/MFI b/MFI
diff --git a/Meta_Mirror b/Meta_Mirror
diff --git a/Meta_Multi b/Meta_Multi
diff --git a/Meta_Reversal b/Meta_Reversal
diff --git a/Momentum b/Momentum
diff --git a/OBV b/OBV
diff --git a/OsMA b/OsMA
diff --git a/Oscillator b/Oscillator
diff --git a/Oscillator_Cross b/Oscillator_Cross
diff --git a/Oscillator_Cross_Shift b/Oscillator_Cross_Shift
diff --git a/Oscillator_Cross_Zero b/Oscillator_Cross_Zero
diff --git a/Oscillator_Divergence b/Oscillator_Divergence
diff --git a/Oscillator_Multi b/Oscillator_Multi
diff --git a/Oscillator_Range b/Oscillator_Range
diff --git a/Pattern b/Pattern
diff --git a/Pinbar b/Pinbar
diff --git a/Pivot b/Pivot
+4 −4		.github/workflows/backtest.yml
+3 −3		.github/workflows/check.yml
+6 −6		.github/workflows/compile.yml
+6 −6		.github/workflows/optimize-indi.yml
+6 −6		.github/workflows/optimize-pricestop.yml
+6 −6		.github/workflows/optimize-signalclose.yml
+6 −6		.github/workflows/optimize-signalopen.yml
+6 −6		.github/workflows/optimize-tick.yml
+1 −7		README.md
+1 −1		Stg_AC.mq5
+20 −19		Stg_AC.mqh
+2 −2		Stg_AC.mqproj
+10 −10		.github/workflows/backtest.yml
+3 −3		.github/workflows/check.yml
+11 −16		.github/workflows/compile.yml
+13 −12		Indi_ATR_MA_Trend.mqh
+1 −7		README.md
+1 −1		Stg_ATR_MA_Trend.mq5
+1 −1		Stg_ATR_MA_Trend.mqh
+2 −2		Stg_ATR_MA_Trend.mqproj
+1 −1		config/H1.h
+1 −1		config/H4.h
+1 −1		config/M1.h
+1 −1		config/M15.h
+1 −1		config/M30.h
+1 −1		config/M5.h
+1 −1		indicators-other
+11 −7		.github/workflows/backtest.yml
+3 −3		.github/workflows/check.yml
+5 −5		.github/workflows/compile.yml
+9 −11		.pre-commit-config.yaml
+12 −10		README.md
+1 −1		Stg_Demo.mq5
+2 −17		Stg_Demo.mqh
+0 −15		config/H1.h
+0 −15		config/H4.h
+0 −15		config/H8.h
+0 −15		config/M1.h
+0 −15		config/M15.h
+0 −15		config/M30.h
+0 −15		config/M5.h
+0 −1		config/define.h
+0 −29		config/template.j2
+4 −6		.github/workflows/backtest.yml
+3 −4		.github/workflows/check.yml
+6 −7		.github/workflows/compile.yml
+5 −11		.github/workflows/test-export.yml
+0 −7		README.md
+1 −1		Stg_Indicator.mq5
+15 −21		Stg_Indicator.mqh