From b1e3ba97e24bf46bc8447a48f08ddc855c1ba932 Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 10 Sep 2023 20:40:20 +0100 Subject: [PATCH 1/6] Adds more strategies into includes.h --- includes.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/includes.h b/includes.h index 5a5ab45..1dc96b1 100644 --- a/includes.h +++ b/includes.h @@ -28,6 +28,7 @@ #include "ATR/Stg_ATR.mqh" #include "ATR_MA_Trend/Stg_ATR_MA_Trend.mqh" #include "Alligator/Stg_Alligator.mqh" +#include "Arrows/Stg_Arrows.mqh" #include "Awesome/Stg_Awesome.mqh" #include "BWMFI/Stg_BWMFI.mqh" #include "Bands/Stg_Bands.mqh" @@ -36,6 +37,7 @@ #include "CCI/Stg_CCI.mqh" #include "Chaikin/Stg_Chaikin.mqh" #include "DEMA/Stg_DEMA.mqh" +#include "DPO/Stg_DPO.mqh" #include "DeMarker/Stg_DeMarker.mqh" #include "ElliottWave/Stg_ElliottWave.mqh" #include "Envelopes/Stg_Envelopes.mqh" @@ -47,24 +49,35 @@ #include "Indicator/Stg_Indicator.mqh" #include "MA/Stg_MA.mqh" #include "MACD/Stg_MACD.mqh" +#include "MA_Cross_Pivot/Stg_MA_Cross_Pivot.mqh" +#include "MA_Cross_Shift/Stg_MA_Cross_Shift.mqh" +#include "MA_Cross_Sup_Res/Stg_MA_Cross_Sup_Res.mqh" +#include "MFI/Stg_MFI.mqh" #include "Meta_Mirror/Stg_Meta_Mirror.mqh" #include "Meta_Multi/Stg_Meta_Multi.mqh" #include "Meta_Reversal/Stg_Meta_Reversal.mqh" -#include "MFI/Stg_MFI.mqh" #include "Momentum/Stg_Momentum.mqh" #include "OBV/Stg_OBV.mqh" #include "OSMA/Stg_OSMA.mqh" +#include "Oscillator/Stg_Oscillator.mqh" +#include "Oscillator_Cross/Stg_Oscillator_Cross.mqh" +#include "Oscillator_Cross_Shift/Stg_Oscillator_Cross_Shift.mqh" +#include "Oscillator_Cross_Zero/Stg_Oscillator_Cross_Zero.mqh" +#include "Oscillator_Divergence/Stg_Oscillator_Divergence.mqh" +#include "Oscillator_Multi/Stg_Oscillator_Multi.mqh" +#include "Oscillator_Range/Stg_Oscillator_Range.mqh" #include "Pattern/Stg_Pattern.mqh" #include "Pinbar/Stg_Pinbar.mqh" #include "Pivot/Stg_Pivot.mqh" #include "RSI/Stg_RSI.mqh" #include "RVI/Stg_RVI.mqh" +#include "Retracement/Stg_Retracement.mqh" #include "SAR/Stg_SAR.mqh" #include "SAWA/Stg_SAWA.mqh" #include "SVE_Bollinger_Bands/Stg_SVE_Bollinger_Bands.mqh" #include "StdDev/Stg_StdDev.mqh" -#include "SuperTrend/Stg_SuperTrend.mqh" #include "Stochastic/Stg_Stochastic.mqh" +#include "SuperTrend/Stg_SuperTrend.mqh" #include "TMAT_SVEBB/Stg_TMAT_SVEBB.mqh" #include "TMA_CG/Stg_TMA_CG.mqh" #include "TMA_True/Stg_TMA_True.mqh" From 1a1762d80c03f2a47dafe3b7b943336c5274c3fb Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 10 Sep 2023 20:40:43 +0100 Subject: [PATCH 2/6] Removes strategies.h in favor of includes.h --- strategies.h | 83 ---------------------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 strategies.h diff --git a/strategies.h b/strategies.h deleted file mode 100644 index 9323bea..0000000 --- a/strategies.h +++ /dev/null @@ -1,83 +0,0 @@ -//+------------------------------------------------------------------+ -//| EA31337 - multi-strategy advanced trading robot | -//| Copyright 2016-2023, EA31337 Ltd | -//| https://github.com/EA31337 | -//+------------------------------------------------------------------+ - -/* - * This file is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Includes strategy classes. -#include "AC/Stg_AC.mqh" -#include "AD/Stg_AD.mqh" -#include "ADX/Stg_ADX.mqh" -#include "AMA/Stg_AMA.mqh" -#include "ASI/Stg_ASI.mqh" -#include "ATR/Stg_ATR.mqh" -#include "ATR_MA_Trend/Stg_ATR_MA_Trend.mqh" -#include "Alligator/Stg_Alligator.mqh" -#include "Arrows/Stg_Arrows.mqh" -#include "Awesome/Stg_Awesome.mqh" -#include "BWMFI/Stg_BWMFI.mqh" -#include "Bands/Stg_Bands.mqh" -#include "BearsPower/Stg_BearsPower.mqh" -#include "BullsPower/Stg_BullsPower.mqh" -#include "CCI/Stg_CCI.mqh" -#include "Chaikin/Stg_Chaikin.mqh" -#include "DEMA/Stg_DEMA.mqh" -#include "DPO/Stg_DPO.mqh" -#include "DeMarker/Stg_DeMarker.mqh" -#include "ElliottWave/Stg_ElliottWave.mqh" -#include "Envelopes/Stg_Envelopes.mqh" -#include "Force/Stg_Force.mqh" -#include "Fractals/Stg_Fractals.mqh" -#include "Gator/Stg_Gator.mqh" -#include "HeikenAshi/Stg_HeikenAshi.mqh" -#include "Ichimoku/Stg_Ichimoku.mqh" -#include "Indicator/Stg_Indicator.mqh" -#include "MA/Stg_MA.mqh" -#include "MA_Cross_Pivot/Stg_MA_Cross_Pivot.mqh" -#include "MA_Cross_Shift/Stg_MA_Cross_Shift.mqh" -#include "MA_Cross_Sup_Res/Stg_MA_Cross_Sup_Res.mqh" -#include "MACD/Stg_MACD.mqh" -#include "MFI/Stg_MFI.mqh" -#include "Meta_Multi/Stg_Meta_Multi.mqh" -#include "Momentum/Stg_Momentum.mqh" -#include "OBV/Stg_OBV.mqh" -#include "OSMA/Stg_OSMA.mqh" -#include "Oscillator/Stg_Oscillator.mqh" -#include "Oscillator_Divergence/Stg_Oscillator_Divergence.mqh" -#include "Oscillator_Cross/Stg_Oscillator_Cross.mqh" -#include "Oscillator_Cross_Shift/Stg_Oscillator_Cross_Shift.mqh" -#include "Oscillator_Cross_Zero/Stg_Oscillator_Cross_Zero.mqh" -#include "Oscillator_Multi/Stg_Oscillator_Multi.mqh" -#include "Oscillator_Range/Stg_Oscillator_Range.mqh" -#include "Pattern/Stg_Pattern.mqh" -#include "Pinbar/Stg_Pinbar.mqh" -#include "Pivot/Stg_Pivot.mqh" -#include "Retracement/Stg_Retracement.mqh" -#include "RSI/Stg_RSI.mqh" -#include "RVI/Stg_RVI.mqh" -#include "SAR/Stg_SAR.mqh" -#include "SAWA/Stg_SAWA.mqh" -#include "SVE_Bollinger_Bands/Stg_SVE_Bollinger_Bands.mqh" -#include "StdDev/Stg_StdDev.mqh" -#include "Stochastic/Stg_Stochastic.mqh" -#include "SuperTrend/Stg_SuperTrend.mqh" -#include "TMAT_SVEBB/Stg_TMAT_SVEBB.mqh" -#include "TMA_CG/Stg_TMA_CG.mqh" -#include "TMA_True/Stg_TMA_True.mqh" -#include "WPR/Stg_WPR.mqh" -#include "ZigZag/Stg_ZigZag.mqh" From 6bb49a830abda988096aa59e13f4a27394c2e074 Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 10 Sep 2023 21:00:26 +0100 Subject: [PATCH 3/6] Corrects comments for Oscillator Divergence --- enum.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enum.h b/enum.h index 3a99902..c41cfe0 100644 --- a/enum.h +++ b/enum.h @@ -64,7 +64,7 @@ enum ENUM_STRATEGY { STRAT_MOMENTUM, // Momentum STRAT_OBV, // OBV STRAT_OSCILLATOR, // Oscillator - STRAT_OSCILLATOR_DIVERGENCE, // Oscillator + STRAT_OSCILLATOR_DIVERGENCE, // Oscillator Divergence STRAT_OSCILLATOR_MULTI, // Oscillator Multi STRAT_OSCILLATOR_CROSS, // Oscillator Cross STRAT_OSCILLATOR_CROSS_SHIFT, // Oscillator Cross Shift From b5058cf40383a557c5aa9ff5e4e4941f0fd48259 Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 10 Sep 2023 21:00:58 +0100 Subject: [PATCH 4/6] Removes meta strategies from meta themselves --- Meta_Mirror | 2 +- Meta_Reversal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Meta_Mirror b/Meta_Mirror index e4b3f04..56f25d0 160000 --- a/Meta_Mirror +++ b/Meta_Mirror @@ -1 +1 @@ -Subproject commit e4b3f0436aa879b4003b76edf6289e803d1227d6 +Subproject commit 56f25d0e53b9e4b7dd1b1696808e4858ece1e3ca diff --git a/Meta_Reversal b/Meta_Reversal index 55462d7..05bf2a3 160000 --- a/Meta_Reversal +++ b/Meta_Reversal @@ -1 +1 @@ -Subproject commit 55462d760e3b08dae1bd273fd63105a5b8a189e0 +Subproject commit 05bf2a38b47ad51e60b08c2bbdf558e840863ad5 From 482942778bd353a29b447be0e07c791a1c7168b6 Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 10 Sep 2023 21:11:14 +0100 Subject: [PATCH 5/6] GHA: Simplifies compilation test --- .github/Test.mq5 | 2 +- .github/workflows/compile.yml | 105 ---------------------------------- 2 files changed, 1 insertion(+), 106 deletions(-) diff --git a/.github/Test.mq5 b/.github/Test.mq5 index 59118b5..672f599 100644 --- a/.github/Test.mq5 +++ b/.github/Test.mq5 @@ -32,7 +32,7 @@ // Local includes. #include "../enum.h" -#include "../strategies.h" +#include "../includes.h" // Adds Demo strategy. #include "../Demo/Stg_Demo.mqh" diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index c06a281..75ff706 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -22,111 +22,6 @@ on: jobs: Compile: - defaults: - run: - shell: powershell - runs-on: windows-latest - strategy: - matrix: - name: - - AC - - AD - - ADX - - AMA - - ASI - - ATR - - ATR_MA_Trend - - Alligator - - Awesome - - BWMFI - - Bands - - BearsPower - - BullsPower - - CCI - - Chaikin - - DEMA - - DeMarker - - ElliottWave - - Envelopes - - Force - - Fractals - - Gator - - HeikenAshi - - 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 - - SAWA - - SVE_Bollinger_Bands - - StdDev - - Stochastic - - SuperTrend - - TMAT_SVEBB - - TMA_CG - - TMA_True - - WPR - - ZigZag - max-parallel: 4 - 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@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 - uses: fx31337/mql-compile-action@master - with: - include: . - mt-version: 5.0.0.2361 - path: ./${{ matrix.name }}/Stg_${{ matrix.name }}.mq4 - verbose: true - - name: Compile for MQL5 - uses: fx31337/mql-compile-action@master - with: - include: . - mt-version: 5.0.0.2515 - path: ./${{ matrix.name }}/Stg_${{ matrix.name }}.mq5 - verbose: true - - name: List compiled files - run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname' - - run: Get-Location - Compile-All: defaults: run: shell: powershell From 664617bb4afb0f9f7b562518ec0e43557f248be3 Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 10 Sep 2023 22:53:43 +0100 Subject: [PATCH 6/6] Adds support for more strategies for meta --- Meta_Mirror | 2 +- Meta_Reversal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Meta_Mirror b/Meta_Mirror index 56f25d0..b9b26c9 160000 --- a/Meta_Mirror +++ b/Meta_Mirror @@ -1 +1 @@ -Subproject commit 56f25d0e53b9e4b7dd1b1696808e4858ece1e3ca +Subproject commit b9b26c9f7ea8286e79547a4df2f60c6d24a085dc diff --git a/Meta_Reversal b/Meta_Reversal index 05bf2a3..db2695c 160000 --- a/Meta_Reversal +++ b/Meta_Reversal @@ -1 +1 @@ -Subproject commit 05bf2a38b47ad51e60b08c2bbdf558e840863ad5 +Subproject commit db2695ca59ca30c9c4bb364fc80a1649feec32b0