Skip to content

Commit 686adb1

Browse files
authored
Merge pull request #24 from EA31337/dev
New strategies: AMA, ASI, Chaikin and Pivot
2 parents 43c64aa + 3907e65 commit 686adb1

File tree

7 files changed

+21
-4
lines changed

7 files changed

+21
-4
lines changed

src/EA31337-Libre.mq5

+8
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ bool EAStrategyAdd(ENUM_STRATEGY _stg, int _tfs) {
245245
return ea.StrategyAdd<Stg_AD>(_tfs, _magic_no, _stg);
246246
case STRAT_ADX:
247247
return ea.StrategyAdd<Stg_ADX>(_tfs, _magic_no, _stg);
248+
case STRAT_AMA:
249+
return ea.StrategyAdd<Stg_AMA>(_tfs, _magic_no, _stg);
250+
case STRAT_ASI:
251+
return ea.StrategyAdd<Stg_ASI>(_tfs, _magic_no, _stg);
248252
case STRAT_ATR:
249253
return ea.StrategyAdd<Stg_ATR>(_tfs, _magic_no, _stg);
250254
case STRAT_ALLIGATOR:
@@ -261,6 +265,8 @@ bool EAStrategyAdd(ENUM_STRATEGY _stg, int _tfs) {
261265
return ea.StrategyAdd<Stg_BullsPower>(_tfs, _magic_no, _stg);
262266
case STRAT_CCI:
263267
return ea.StrategyAdd<Stg_CCI>(_tfs, _magic_no, _stg);
268+
case STRAT_CHAIKIN:
269+
return ea.StrategyAdd<Stg_Chaikin>(_tfs, _magic_no, _stg);
264270
case STRAT_DEMA:
265271
return ea.StrategyAdd<Stg_DEMA>(_tfs, _magic_no, _stg);
266272
case STRAT_DEMARKER:
@@ -291,6 +297,8 @@ bool EAStrategyAdd(ENUM_STRATEGY _stg, int _tfs) {
291297
return ea.StrategyAdd<Stg_OsMA>(_tfs, _magic_no, _stg);
292298
case STRAT_PATTERN:
293299
return ea.StrategyAdd<Stg_Pattern>(_tfs, _magic_no, _stg);
300+
case STRAT_PIVOT:
301+
return ea.StrategyAdd<Stg_Pivot>(_tfs, _magic_no, _stg);
294302
case STRAT_RSI:
295303
return ea.StrategyAdd<Stg_RSI>(_tfs, _magic_no, _stg);
296304
case STRAT_RVI:

src/EA31337-Libre.mqproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"program_type":"expert",
44
"copyright" :"Copyright 2016-2021, EA31337 Ltd",
55
"link" :"https:\/\/github.com\/EA31337\/EA31337-Libre",
6-
"version" :"1.006",
6+
"version" :"1.007",
77
"description" :"Forex trading robot",
88
"optimize" :"0",
99
"fpzerocheck" :"1",

src/include/classes

Submodule classes updated 112 files

src/include/define.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
// EA defines.
2323
#define ea_name "EA31337 Libre"
24-
#define ea_version "1.006"
24+
#define ea_version "1.007"
2525
#define ea_desc "Forex trading robot"
2626
#define ea_link "https://github.com/EA31337/EA31337-Libre"
2727
#define ea_author "kenorb"

src/include/enum.h

+4
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@ enum ENUM_STRATEGY { // Define list of strategies.
2626
STRAT_AD, // AD
2727
STRAT_ADX, // ADX
2828
STRAT_ALLIGATOR, // Alligator
29+
STRAT_AMA, // AMA
30+
STRAT_ASI, // ASI
2931
STRAT_ATR, // ATR
3032
STRAT_AWESOME, // Awesome
3133
STRAT_BANDS, // Bands
3234
STRAT_BEARS_POWER, // Bear Power
3335
STRAT_BULLS_POWER, // Bulls Power
3436
STRAT_BWMFI, // BWMFI
3537
STRAT_CCI, // CCI
38+
STRAT_CHAIKIN, // Chaikin
3639
STRAT_DEMA, // DEMA
3740
STRAT_DEMARKER, // DeMarker
3841
STRAT_ENVELOPES, // Envelopes
@@ -48,6 +51,7 @@ enum ENUM_STRATEGY { // Define list of strategies.
4851
STRAT_OBV, // OBV
4952
STRAT_OSMA, // OSMA
5053
STRAT_PATTERN, // Pattern
54+
STRAT_PIVOT, // Pivot
5155
STRAT_RSI, // RSI
5256
STRAT_RVI, // RVI
5357
STRAT_SAR, // SAR

src/include/includes.h

+5
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,18 @@
3838
#include "classes/Indicators/Indi_AC.mqh"
3939
#include "classes/Indicators/Indi_AD.mqh"
4040
#include "classes/Indicators/Indi_ADX.mqh"
41+
#include "classes/Indicators/Indi_ADXW.mqh"
42+
#include "classes/Indicators/Indi_AMA.mqh"
4143
#include "classes/Indicators/Indi_AO.mqh"
44+
#include "classes/Indicators/Indi_ASI.mqh"
4245
#include "classes/Indicators/Indi_ATR.mqh"
4346
#include "classes/Indicators/Indi_Alligator.mqh"
4447
#include "classes/Indicators/Indi_BWMFI.mqh"
4548
#include "classes/Indicators/Indi_Bands.mqh"
4649
#include "classes/Indicators/Indi_BearsPower.mqh"
4750
#include "classes/Indicators/Indi_BullsPower.mqh"
4851
#include "classes/Indicators/Indi_CCI.mqh"
52+
#include "classes/Indicators/Indi_CHO.mqh"
4953
#include "classes/Indicators/Indi_DEMA.mqh"
5054
#include "classes/Indicators/Indi_DeMarker.mqh"
5155
#include "classes/Indicators/Indi_Envelopes.mqh"
@@ -61,6 +65,7 @@
6165
#include "classes/Indicators/Indi_OBV.mqh"
6266
#include "classes/Indicators/Indi_OsMA.mqh"
6367
#include "classes/Indicators/Indi_Pattern.mqh"
68+
#include "classes/Indicators/Indi_Pivot.mqh"
6469
#include "classes/Indicators/Indi_Price.mqh"
6570
#include "classes/Indicators/Indi_RSI.mqh"
6671
#include "classes/Indicators/Indi_RVI.mqh"

0 commit comments

Comments
 (0)