diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 0b57db0..125dabb 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -63,6 +63,7 @@ jobs: - OBV - OsMA - Oscillator + - Oscillator_Multi - Pattern - Pinbar - Pivot diff --git a/.gitmodules b/.gitmodules index 49a996c..ec107e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -106,6 +106,9 @@ [submodule "Oscillator"] path = Oscillator url = https://github.com/EA31337/Strategy-Oscillator.git +[submodule "Oscillator_Multi"] + path = Oscillator_Multi + url = https://github.com/EA31337/Strategy-Oscillator_Multi.git [submodule "Pattern"] path = Pattern url = https://github.com/EA31337/Strategy-Pattern.git diff --git a/Oscillator_Multi b/Oscillator_Multi new file mode 160000 index 0000000..2bc1d47 --- /dev/null +++ b/Oscillator_Multi @@ -0,0 +1 @@ +Subproject commit 2bc1d47b86c1b54c9b0fceb9bfe7c29b326f8570 diff --git a/README.md b/README.md index 18e3980..7e26544 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,7 @@ See: | OBV | [![check][ghim_s_obv_check]][ghlm_s_obv_check] | [![check][ghim_s_obv_compile]][ghlm_s_obv_compile] | [![check][ghim_s_obv_bt]][ghlm_s_obv_bt] | | OsMA | [![check][ghim_s_osma_check]][ghlm_s_osma_check] | [![check][ghim_s_osma_compile]][ghlm_s_osma_compile] | [![check][ghim_s_osma_bt]][ghlm_s_osma_bt] | | Oscillator | [![check][ghim_s_osc_check]][ghlm_s_osc_check] | [![check][ghim_s_osc_compile]][ghlm_s_osc_compile] | [![check][ghim_s_osc_bt]][ghlm_s_osc_bt] | +| Oscillator Multi | [![check][ghim_s_osc_multi_check]][ghlm_s_osc_multi_check] | [![check][ghim_s_osc_multi_compile]][ghlm_s_osc_multi_compile] | [![check][ghim_s_osc_multi_bt]][ghlm_s_osc_multi_bt] | | Pinbar | [![check][ghim_s_pinbar_check]][ghlm_s_pinbar_check] | [![check][ghim_s_pinbar_compile]][ghlm_s_pinbar_compile] | [![check][ghim_s_pinbar_bt]][ghlm_s_pinbar_bt] | | Pivot | [![check][ghim_s_pivot_check]][ghlm_s_pivot_check] | [![check][ghim_s_pivot_compile]][ghlm_s_pivot_compile] | [![check][ghim_s_pivot_bt]][ghlm_s_pivot_bt] | | RSI | [![check][ghim_s_rsi_check]][ghlm_s_rsi_check] | [![check][ghim_s_rsi_compile]][ghlm_s_rsi_compile] | [![check][ghim_s_rsi_bt]][ghlm_s_rsi_bt] | @@ -147,6 +148,7 @@ See: | OBV | [![check][ghid_s_obv_check]][ghld_s_obv_check] | [![check][ghid_s_obv_compile]][ghld_s_obv_compile] | [![check][ghid_s_obv_bt]][ghld_s_obv_bt] | | OsMA | [![check][ghid_s_osma_check]][ghld_s_osma_check] | [![check][ghid_s_osma_compile]][ghld_s_osma_compile] | [![check][ghid_s_osma_bt]][ghld_s_osma_bt] | | Oscillator | [![check][ghid_s_osc_check]][ghld_s_osc_check] | [![check][ghid_s_osc_compile]][ghld_s_osc_compile] | [![check][ghid_s_osc_bt]][ghld_s_osc_bt] | +| Oscillator Multi | [![check][ghid_s_osc_multi_check]][ghld_s_osc_multi_check] | [![check][ghid_s_osc_multi_compile]][ghld_s_osc_multi_compile] | [![check][ghid_s_osc_multi_bt]][ghld_s_osc_multi_bt] | | Pinbar | [![check][ghid_s_pinbar_check]][ghld_s_pinbar_check] | [![check][ghid_s_pinbar_compile]][ghld_s_pinbar_compile] | [![check][ghid_s_pinbar_bt]][ghld_s_pinbar_bt] | | Pivot | [![check][ghid_s_pivot_check]][ghld_s_pivot_check] | [![check][ghid_s_pivot_compile]][ghld_s_pivot_compile] | [![check][ghid_s_pivot_bt]][ghld_s_pivot_bt] | | RSI | [![check][ghid_s_rsi_check]][ghld_s_rsi_check] | [![check][ghid_s_rsi_compile]][ghld_s_rsi_compile] | [![check][ghid_s_rsi_bt]][ghld_s_rsi_bt] | @@ -760,6 +762,20 @@ NO REPRESENTATION IS BEING MADE THAN ANY ACCOUNT WILL OR IS LIKELY TO ACHIEVE PR [ghld_s_osc_bt]: https://github.com/EA31337/Strategy-Oscillator/actions?query=workflow:Backtest+branch:dev [ghid_s_osc_bt]: https://github.com/EA31337/Strategy-Oscillator/workflows/Backtest/badge.svg?branch=dev +[ghlm_s_osc_multi_check]: https://github.com/EA31337/Strategy-Oscillator_Multi/actions?query=workflow:Check+branch:master +[ghim_s_osc_multi_check]: https://github.com/EA31337/Strategy-Oscillator_Multi/workflows/Check/badge.svg?branch=master +[ghlm_s_osc_multi_compile]: https://github.com/EA31337/Strategy-Oscillator_Multi/actions?query=workflow:Compile+branch:master +[ghim_s_osc_multi_compile]: https://github.com/EA31337/Strategy-Oscillator_Multi/workflows/Compile/badge.svg?branch=master +[ghlm_s_osc_multi_bt]: https://github.com/EA31337/Strategy-Oscillator_Multi/actions?query=workflow:Backtest+branch:master +[ghim_s_osc_multi_bt]: https://github.com/EA31337/Strategy-Oscillator_Multi/workflows/Backtest/badge.svg?branch=master + +[ghld_s_osc_multi_check]: https://github.com/EA31337/Strategy-Oscillator_Multi/actions?query=workflow:Check+branch:dev +[ghid_s_osc_multi_check]: https://github.com/EA31337/Strategy-Oscillator_Multi/workflows/Check/badge.svg?branch=dev +[ghld_s_osc_multi_compile]: https://github.com/EA31337/Strategy-Oscillator_Multi/actions?query=workflow:Compile+branch:dev +[ghid_s_osc_multi_compile]: https://github.com/EA31337/Strategy-Oscillator_Multi/workflows/Compile/badge.svg?branch=dev +[ghld_s_osc_multi_bt]: https://github.com/EA31337/Strategy-Oscillator_Multi/actions?query=workflow:Backtest+branch:dev +[ghid_s_osc_multi_bt]: https://github.com/EA31337/Strategy-Oscillator_Multi/workflows/Backtest/badge.svg?branch=dev + [ghlm_s_osma_check]: https://github.com/EA31337/Strategy-OsMA/actions?query=workflow:Check+branch:master [ghim_s_osma_check]: https://github.com/EA31337/Strategy-OsMA/workflows/Check/badge.svg?branch=master [ghlm_s_osma_compile]: https://github.com/EA31337/Strategy-OsMA/actions?query=workflow:Compile+branch:master diff --git a/enum.h b/enum.h index ea4a89e..fe3b0e4 100644 --- a/enum.h +++ b/enum.h @@ -60,6 +60,7 @@ enum ENUM_STRATEGY { STRAT_MOMENTUM, // Momentum STRAT_OBV, // OBV STRAT_OSCILLATOR, // Oscillator + STRAT_OSCILLATOR_MULTI, // Oscillator Multi STRAT_OSMA, // OSMA STRAT_PATTERN, // Pattern STRAT_PINBAR, // Pinbar diff --git a/strategies.h b/strategies.h index d328acc..663c5b3 100644 --- a/strategies.h +++ b/strategies.h @@ -54,6 +54,7 @@ #include "OBV/Stg_OBV.mqh" #include "OSMA/Stg_OSMA.mqh" #include "Oscillator/Stg_Oscillator.mqh" +#include "Oscillator_Multi/Stg_Oscillator_Multi.mqh" #include "Pattern/Stg_Pattern.mqh" #include "Pinbar/Stg_Pinbar.mqh" #include "Pivot/Stg_Pivot.mqh"