From afadff5ede3634395d11f6c93bf83f57580cf2de Mon Sep 17 00:00:00 2001 From: kenorb Date: Fri, 29 Sep 2023 22:44:16 +0100 Subject: [PATCH] Adds Meta Conditions strategy --- .github/workflows/compile.yml | 1 + .gitmodules | 3 +++ Meta_Conditions | 1 + README.md | 16 ++++++++++++++++ enum.h | 1 + includes.h | 1 + 6 files changed, 23 insertions(+) create mode 160000 Meta_Conditions diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 0df11bf..5ab5d8a 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -63,6 +63,7 @@ jobs: - MACD - MFI - Meta_Bears_Bulls + - Meta_Conditions - Meta_Double - Meta_Mirror - Meta_Multi diff --git a/.gitmodules b/.gitmodules index 3cdb6cf..1014659 100644 --- a/.gitmodules +++ b/.gitmodules @@ -106,6 +106,9 @@ [submodule "Meta_Bears_Bulls"] path = Meta_Bears_Bulls url = https://github.com/EA31337/Strategy-Meta_Bears_Bulls.git +[submodule "Meta_Conditions"] + path = Meta_Conditions + url = https://github.com/EA31337/Strategy-Meta_Conditions.git [submodule "Meta_Double"] path = Meta_Double url = https://github.com/EA31337/Strategy-Meta_Double.git diff --git a/Meta_Conditions b/Meta_Conditions new file mode 160000 index 0000000..99cc184 --- /dev/null +++ b/Meta_Conditions @@ -0,0 +1 @@ +Subproject commit 99cc184c9b907e04d8b4f0a4d6b81cd35e1d853e diff --git a/README.md b/README.md index 02f0ee3..4efdd37 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ See: | Strategy | Check | Compile | Backtest | | --------:|:-----:|:-------:|:--------:| | (Meta) Double | [![check][ghim_s_meta_double_check]][ghlm_s_meta_double_check] | [![check][ghim_s_meta_double_compile]][ghlm_s_meta_double_compile] | [![check][ghim_s_meta_double_bt]][ghlm_s_meta_double_bt] | +| (Meta) Conditions | [![check][ghim_s_meta_conditions_check]][ghlm_s_meta_conditions_check] | [![check][ghim_s_meta_conditions_compile]][ghlm_s_meta_conditions_compile] | [![check][ghim_s_meta_conditions_bt]][ghlm_s_meta_conditions_bt] | | (Meta) Mirror | [![check][ghim_s_meta_mirror_check]][ghlm_s_meta_mirror_check] | [![check][ghim_s_meta_mirror_compile]][ghlm_s_meta_mirror_compile] | [![check][ghim_s_meta_mirror_bt]][ghlm_s_meta_mirror_bt] | | (Meta) Multi | [![check][ghim_s_meta_multi_check]][ghlm_s_meta_multi_check] | [![check][ghim_s_meta_multi_compile]][ghlm_s_meta_multi_compile] | [![check][ghim_s_meta_multi_bt]][ghlm_s_meta_multi_bt] | | (Meta) Oscillator | [![check][ghim_s_meta_osc_check]][ghlm_s_meta_osc_check] | [![check][ghim_s_meta_osc_compile]][ghlm_s_meta_osc_compile] | [![check][ghim_s_meta_osc_bt]][ghlm_s_meta_osc_bt] | @@ -134,6 +135,7 @@ See: | Strategy | Check | Compile | Backtest | | --------:|:-----:|:-------:|:--------:| | (Meta) Double | [![check][ghid_s_meta_double_check]][ghld_s_meta_double_check] | [![check][ghid_s_meta_double_compile]][ghld_s_meta_double_compile] | [![check][ghid_s_meta_double_bt]][ghld_s_meta_double_bt] | +| (Meta) Conditions | [![check][ghid_s_meta_conditions_check]][ghld_s_meta_conditions_check] | [![check][ghid_s_meta_conditions_compile]][ghld_s_meta_conditions_compile] | [![check][ghid_s_meta_conditions_bt]][ghld_s_meta_conditions_bt] | | (Meta) Mirror | [![check][ghid_s_meta_mirror_check]][ghld_s_meta_mirror_check] | [![check][ghid_s_meta_mirror_compile]][ghld_s_meta_mirror_compile] | [![check][ghid_s_meta_mirror_bt]][ghld_s_meta_mirror_bt] | | (Meta) Multi | [![check][ghid_s_meta_multi_check]][ghld_s_meta_multi_check] | [![check][ghid_s_meta_multi_compile]][ghld_s_meta_multi_compile] | [![check][ghid_s_meta_multi_bt]][ghld_s_meta_multi_bt] | | (Meta) Oscillator | [![check][ghid_s_meta_osc_check]][ghld_s_meta_osc_check] | [![check][ghid_s_meta_osc_compile]][ghld_s_meta_osc_compile] | [![check][ghid_s_meta_osc_bt]][ghld_s_meta_osc_bt] | @@ -316,6 +318,20 @@ NO REPRESENTATION IS BEING MADE THAN ANY ACCOUNT WILL OR IS LIKELY TO ACHIEVE PR [ghld_s_meta_double_bt]: https://github.com/EA31337/Strategy-Meta_Double/actions?query=workflow:Backtest+branch:dev [ghid_s_meta_double_bt]: https://github.com/EA31337/Strategy-Meta_Double/workflows/Backtest/badge.svg?branch=dev +[ghlm_s_meta_conditions_check]: https://github.com/EA31337/Strategy-Meta_Conditions/actions?query=workflow:Check+branch:master +[ghim_s_meta_conditions_check]: https://github.com/EA31337/Strategy-Meta_Conditions/workflows/Check/badge.svg?branch=master +[ghlm_s_meta_conditions_compile]: https://github.com/EA31337/Strategy-Meta_Conditions/actions?query=workflow:Compile+branch:master +[ghim_s_meta_conditions_compile]: https://github.com/EA31337/Strategy-Meta_Conditions/workflows/Compile/badge.svg?branch=master +[ghlm_s_meta_conditions_bt]: https://github.com/EA31337/Strategy-Meta_Conditions/actions?query=workflow:Backtest+branch:master +[ghim_s_meta_conditions_bt]: https://github.com/EA31337/Strategy-Meta_Conditions/workflows/Backtest/badge.svg?branch=master + +[ghld_s_meta_conditions_check]: https://github.com/EA31337/Strategy-Meta_Conditions/actions?query=workflow:Check+branch:dev +[ghid_s_meta_conditions_check]: https://github.com/EA31337/Strategy-Meta_Conditions/workflows/Check/badge.svg?branch=dev +[ghld_s_meta_conditions_compile]: https://github.com/EA31337/Strategy-Meta_Conditions/actions?query=workflow:Compile+branch:dev +[ghid_s_meta_conditions_compile]: https://github.com/EA31337/Strategy-Meta_Conditions/workflows/Compile/badge.svg?branch=dev +[ghld_s_meta_conditions_bt]: https://github.com/EA31337/Strategy-Meta_Conditions/actions?query=workflow:Backtest+branch:dev +[ghid_s_meta_conditions_bt]: https://github.com/EA31337/Strategy-Meta_Conditions/workflows/Backtest/badge.svg?branch=dev + [ghlm_s_meta_mirror_check]: https://github.com/EA31337/Strategy-Meta_Mirror/actions?query=workflow:Check+branch:master [ghim_s_meta_mirror_check]: https://github.com/EA31337/Strategy-Meta_Mirror/workflows/Check/badge.svg?branch=master [ghlm_s_meta_mirror_compile]: https://github.com/EA31337/Strategy-Meta_Mirror/actions?query=workflow:Compile+branch:master diff --git a/enum.h b/enum.h index d8ef9cd..188718b 100644 --- a/enum.h +++ b/enum.h @@ -61,6 +61,7 @@ enum ENUM_STRATEGY { STRAT_MACD, // MACD STRAT_META_BEARS_BULLS, // (Meta) Bears & Bulls STRAT_META_DOUBLE, // (Meta) Double + STRAT_META_CONDITIONS, // (Meta) Conditions STRAT_META_MIRROR, // (Meta) Mirror STRAT_META_MULTI, // (Meta) Multi STRAT_META_REVERSAL, // (Meta) Reversal diff --git a/includes.h b/includes.h index 37ff19d..489b68a 100644 --- a/includes.h +++ b/includes.h @@ -56,6 +56,7 @@ #include "MA_Trend/Stg_MA_Trend.mqh" #include "MFI/Stg_MFI.mqh" #include "Meta_Bears_Bulls/Stg_Meta_Bears_Bulls.mqh" +#include "Meta_Conditions/Stg_Meta_Conditions.mqh" #include "Meta_Double/Stg_Meta_Double.mqh" #include "Meta_Mirror/Stg_Meta_Mirror.mqh" #include "Meta_Multi/Stg_Meta_Multi.mqh"