Merge pull request #24 from EA31337/dev

New strategies: AMA, ASI, Chaikin and Pivot
EA31337 · Sep 26, 2021 · 686adb1 · 686adb1
2 parents 43c64aa + 3907e65
commit 686adb1
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 4 deletions.
diff --git a/src/EA31337-Libre.mq5 b/src/EA31337-Libre.mq5
@@ -245,6 +245,10 @@ bool EAStrategyAdd(ENUM_STRATEGY _stg, int _tfs) {
       return ea.StrategyAdd<Stg_AD>(_tfs, _magic_no, _stg);
     case STRAT_ADX:
       return ea.StrategyAdd<Stg_ADX>(_tfs, _magic_no, _stg);
+    case STRAT_AMA:
+      return ea.StrategyAdd<Stg_AMA>(_tfs, _magic_no, _stg);
+    case STRAT_ASI:
+      return ea.StrategyAdd<Stg_ASI>(_tfs, _magic_no, _stg);
     case STRAT_ATR:
       return ea.StrategyAdd<Stg_ATR>(_tfs, _magic_no, _stg);
     case STRAT_ALLIGATOR:
@@ -261,6 +265,8 @@ bool EAStrategyAdd(ENUM_STRATEGY _stg, int _tfs) {
       return ea.StrategyAdd<Stg_BullsPower>(_tfs, _magic_no, _stg);
     case STRAT_CCI:
       return ea.StrategyAdd<Stg_CCI>(_tfs, _magic_no, _stg);
+    case STRAT_CHAIKIN:
+      return ea.StrategyAdd<Stg_Chaikin>(_tfs, _magic_no, _stg);
     case STRAT_DEMA:
       return ea.StrategyAdd<Stg_DEMA>(_tfs, _magic_no, _stg);
     case STRAT_DEMARKER:
@@ -291,6 +297,8 @@ bool EAStrategyAdd(ENUM_STRATEGY _stg, int _tfs) {
       return ea.StrategyAdd<Stg_OsMA>(_tfs, _magic_no, _stg);
     case STRAT_PATTERN:
       return ea.StrategyAdd<Stg_Pattern>(_tfs, _magic_no, _stg);
+    case STRAT_PIVOT:
+      return ea.StrategyAdd<Stg_Pivot>(_tfs, _magic_no, _stg);
     case STRAT_RSI:
       return ea.StrategyAdd<Stg_RSI>(_tfs, _magic_no, _stg);
     case STRAT_RVI:

diff --git a/src/EA31337-Libre.mqproj b/src/EA31337-Libre.mqproj
@@ -3,7 +3,7 @@
   "program_type":"expert",
   "copyright"   :"Copyright 2016-2021, EA31337 Ltd",
   "link"        :"https:\/\/github.com\/EA31337\/EA31337-Libre",
-  "version"     :"1.006",
+  "version"     :"1.007",
   "description" :"Forex trading robot",
   "optimize"    :"0",
   "fpzerocheck" :"1",

diff --git a/src/include/classes b/src/include/classes
diff --git a/src/include/define.h b/src/include/define.h
@@ -21,7 +21,7 @@
 
 // EA defines.
 #define ea_name "EA31337 Libre"
-#define ea_version "1.006"
+#define ea_version "1.007"
 #define ea_desc "Forex trading robot"
 #define ea_link "https://github.com/EA31337/EA31337-Libre"
 #define ea_author "kenorb"

diff --git a/src/include/enum.h b/src/include/enum.h
@@ -26,13 +26,16 @@ enum ENUM_STRATEGY { // Define list of strategies.
   STRAT_AD,          // AD
   STRAT_ADX,         // ADX
   STRAT_ALLIGATOR,   // Alligator
+  STRAT_AMA,         // AMA
+  STRAT_ASI,         // ASI
   STRAT_ATR,         // ATR
   STRAT_AWESOME,     // Awesome
   STRAT_BANDS,       // Bands
   STRAT_BEARS_POWER, // Bear Power
   STRAT_BULLS_POWER, // Bulls Power
   STRAT_BWMFI,       // BWMFI
   STRAT_CCI,         // CCI
+  STRAT_CHAIKIN,     // Chaikin
   STRAT_DEMA,        // DEMA
   STRAT_DEMARKER,    // DeMarker
   STRAT_ENVELOPES,   // Envelopes
@@ -48,6 +51,7 @@ enum ENUM_STRATEGY { // Define list of strategies.
   STRAT_OBV,         // OBV
   STRAT_OSMA,        // OSMA
   STRAT_PATTERN,     // Pattern
+  STRAT_PIVOT,       // Pivot
   STRAT_RSI,         // RSI
   STRAT_RVI,         // RVI
   STRAT_SAR,         // SAR

diff --git a/src/include/includes.h b/src/include/includes.h
@@ -38,14 +38,18 @@
 #include "classes/Indicators/Indi_AC.mqh"
 #include "classes/Indicators/Indi_AD.mqh"
 #include "classes/Indicators/Indi_ADX.mqh"
+#include "classes/Indicators/Indi_ADXW.mqh"
+#include "classes/Indicators/Indi_AMA.mqh"
 #include "classes/Indicators/Indi_AO.mqh"
+#include "classes/Indicators/Indi_ASI.mqh"
 #include "classes/Indicators/Indi_ATR.mqh"
 #include "classes/Indicators/Indi_Alligator.mqh"
 #include "classes/Indicators/Indi_BWMFI.mqh"
 #include "classes/Indicators/Indi_Bands.mqh"
 #include "classes/Indicators/Indi_BearsPower.mqh"
 #include "classes/Indicators/Indi_BullsPower.mqh"
 #include "classes/Indicators/Indi_CCI.mqh"
+#include "classes/Indicators/Indi_CHO.mqh"
 #include "classes/Indicators/Indi_DEMA.mqh"
 #include "classes/Indicators/Indi_DeMarker.mqh"
 #include "classes/Indicators/Indi_Envelopes.mqh"
@@ -61,6 +65,7 @@
 #include "classes/Indicators/Indi_OBV.mqh"
 #include "classes/Indicators/Indi_OsMA.mqh"
 #include "classes/Indicators/Indi_Pattern.mqh"
+#include "classes/Indicators/Indi_Pivot.mqh"
 #include "classes/Indicators/Indi_Price.mqh"
 #include "classes/Indicators/Indi_RSI.mqh"
 #include "classes/Indicators/Indi_RVI.mqh"

diff --git a/src/include/strategies b/src/include/strategies
+5 −0		.github/Test.mq5
+4 −2		.github/workflows/compile.yml
+15 −3		.gitmodules
+1 −1		AC
+1 −1		AD
+1 −1		ADX
+1 −0		AMA
+1 −0		ASI
+1 −1		ATR
+1 −1		Alligator
+1 −1		Awesome
+1 −1		BWMFI
+1 −1		Bands
+1 −1		BearsPower
+1 −1		BullsPower
+1 −1		CCI
+1 −0		Chaikin
+1 −1		DEMA
+1 −1		DeMarker
+1 −1		Demo
+1 −1		ElliottWave
+1 −1		Envelopes
+1 −1		Force
+1 −1		Fractals
+1 −1		Gator
+1 −1		HeikenAshi
+1 −1		Ichimoku
+1 −1		MA
+1 −1		MACD
+1 −1		MFI
+1 −1		Momentum
+1 −1		OBV
+1 −1		OsMA
+1 −1		Pattern
+1 −0		Pivot
+73 −24		README.md
+1 −1		RSI
+1 −1		RVI
+1 −1		SAR
+1 −1		SAWA
+1 −1		SVE_Bollinger_Bands
+1 −1		StdDev
+1 −1		Stochastic
+1 −0		TMAT_SVEBB
+0 −1		TMA_Band_SVE_True
+1 −1		TMA_True
+1 −1		WPR
+1 −1		ZigZag
+3 −0		enum.h
+5 −1		strategies.h