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

V2: Adds new strategies and fixes
EA31337 · Oct 28, 2023 · 9609938 · 9609938
2 parents 664617b + 79269b9
commit 9609938
Show file tree

Hide file tree

Showing 36 changed files with 464 additions and 127 deletions.
diff --git a/.github/Test.mq5 b/.github/Test.mq5
@@ -33,6 +33,7 @@
 // Local includes.
 #include "../enum.h"
 #include "../includes.h"
+#include "../manager.h"
 
 // Adds Demo strategy.
 #include "../Demo/Stg_Demo.mqh"

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -21,7 +21,85 @@ on:
       - 'docs/**'
 
 jobs:
-  Compile:
+  Compile-MQL4:
+    defaults:
+      run:
+        shell: powershell
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: actions/checkout@v3
+        with:
+          path: Include/EA31337-classes
+          ref: v3.000.1
+          repository: EA31337/EA31337-classes
+      - uses: actions/checkout@v3
+        with:
+          path: Include/EA31337-strategies
+          ref: v2.000-dev
+          repository: EA31337/EA31337-strategies
+          submodules: recursive
+      - name: Deletes Arrows as it fails to compile
+        run: Remove-Item -LiteralPath "Arrows" -Force -Recurse -Verbose
+      - name: Deletes SVE_Bollinger_Bands as it fails to compile
+        run: Remove-Item -LiteralPath "SVE_Bollinger_Bands" -Force -Recurse
+      - name: Deletes TMAT_SVEBB as it fails to compile
+        run: Remove-Item -LiteralPath "TMAT_SVEBB" -Force -Recurse -Verbose
+      - name: Compile for MQL4
+        uses: fx31337/mql-compile-action@master
+        with:
+          include: .
+          mt-version: 5.0.0.2361
+          path: "*/Stg_*.mq4"
+          verbose: true
+      - name: List compiled files
+        run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
+      - run: Get-Location
+  Compile-MQL5:
+    defaults:
+      run:
+        shell: powershell
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: actions/checkout@v3
+        with:
+          path: Include/EA31337-classes
+          ref: v3.000.1
+          repository: EA31337/EA31337-classes
+      - uses: actions/checkout@v3
+        with:
+          path: Include/EA31337-strategies
+          ref: v2.000-dev
+          repository: EA31337/EA31337-strategies
+          submodules: recursive
+      - name: Deletes Arrows as it fails to compile
+        run: Remove-Item -LiteralPath "Arrows" -Force -Recurse -Verbose
+      - name: Deletes SAWA as it fails to compile
+        run: Remove-Item -LiteralPath "SAWA" -Force -Recurse -Verbose
+      - name: Deletes SVE_Bollinger_Bands as it fails to compile
+        run: Remove-Item -LiteralPath "SVE_Bollinger_Bands" -Force -Recurse
+      - name: Deletes TMAT_SVEBB as it fails to compile
+        run: Remove-Item -LiteralPath "TMAT_SVEBB" -Force -Recurse -Verbose
+      - name: Deletes TMA_True as it fails to compile
+        run: Remove-Item -LiteralPath "TMA_True" -Force -Recurse -Verbose
+      - name: Deletes ElliottWave as it fails to compile
+        run: Remove-Item -LiteralPath "ElliottWave" -Force -Recurse -Verbose
+      - name: Compile for MQL5
+        uses: fx31337/mql-compile-action@master
+        with:
+          include: .
+          mt-version: 5.0.0.2515
+          path: "*/Stg_*.mq5"
+          verbose: true
+      - name: List compiled files
+        run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
+      - run: Get-Location
+  Compile-Test:
     defaults:
       run:
         shell: powershell

diff --git a/.gitmodules b/.gitmodules
@@ -85,6 +85,9 @@
 [submodule "MA"]
 	path = MA
 	url = https://github.com/EA31337/Strategy-MA.git
+[submodule "MA_Breakout"]
+	path = MA_Breakout
+	url = https://github.com/EA31337/Strategy-MA_Breakout.git
 [submodule "MA_Cross_Pivot"]
 	path = MA_Cross_Pivot
 	url = https://github.com/EA31337/Strategy-MA_Cross_Pivot.git
@@ -94,18 +97,15 @@
 [submodule "MA_Cross_Sup_Res"]
 	path = MA_Cross_Sup_Res
 	url = https://github.com/EA31337/Strategy-MA_Cross_Sup_Res.git
+[submodule "MA_Cross_Timeframe"]
+	path = MA_Cross_Timeframe
+	url = https://github.com/EA31337/Strategy-MA_Cross_Timeframe.git
+[submodule "MA_Trend"]
+	path = MA_Trend
+	url = https://github.com/EA31337/Strategy-MA_Trend.git
 [submodule "MACD"]
 	path = MACD
 	url = https://github.com/EA31337/Strategy-MACD.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
@@ -127,18 +127,30 @@
 [submodule "Oscillator_Cross_Shift"]
 	path = Oscillator_Cross_Shift
 	url = https://github.com/EA31337/Strategy-Oscillator_Cross_Shift.git
+[submodule "Oscillator_Cross_Timeframe"]
+	path = Oscillator_Cross_Timeframe
+	url = https://github.com/EA31337/Strategy-Oscillator_Cross_Timeframe.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_Martingale"]
+	path = Oscillator_Martingale
+	url = https://github.com/EA31337/Strategy-Oscillator_Martingale.git
 [submodule "Oscillator_Multi"]
 	path = Oscillator_Multi
 	url = https://github.com/EA31337/Strategy-Oscillator_Multi.git
+[submodule "Oscillator_Overlay"]
+	path = Oscillator_Overlay
+	url = https://github.com/EA31337/Strategy-Oscillator_Overlay.git
 [submodule "Oscillator_Range"]
 	path = Oscillator_Range
 	url = https://github.com/EA31337/Strategy-Oscillator_Range.git
+[submodule "Oscillator_Trend"]
+	path = Oscillator_Trend
+	url = https://github.com/EA31337/Strategy-Oscillator_Trend.git
 [submodule "Pattern"]
 	path = Pattern
 	url = https://github.com/EA31337/Strategy-Pattern.git

diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -1,5 +1,5 @@
 ---
 MD013:
-  line_length: 280
+  line_length: 300
 MD024:
   siblings_only: true
diff --git a/ATR_MA_Trend b/ATR_MA_Trend
diff --git a/ElliottWave b/ElliottWave
diff --git a/MA_Breakout b/MA_Breakout
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/MA_Cross_Timeframe b/MA_Cross_Timeframe
diff --git a/MA_Trend b/MA_Trend
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/Oscillator_Cross b/Oscillator_Cross
diff --git a/Oscillator_Cross_Shift b/Oscillator_Cross_Shift
diff --git a/Oscillator_Cross_Timeframe b/Oscillator_Cross_Timeframe
diff --git a/Oscillator_Cross_Zero b/Oscillator_Cross_Zero
diff --git a/Oscillator_Divergence b/Oscillator_Divergence
diff --git a/Oscillator_Martingale b/Oscillator_Martingale
diff --git a/Oscillator_Multi b/Oscillator_Multi
diff --git a/Oscillator_Overlay b/Oscillator_Overlay
diff --git a/Oscillator_Range b/Oscillator_Range
diff --git a/Oscillator_Trend b/Oscillator_Trend