comment out unneccessary AMarkets Filters for Lightweighting Workspace ...
This commit is contained in:
@@ -27,8 +27,8 @@
|
||||
//
|
||||
#include "./Brent/x-saherelm.x121.amarkets.brent.long.parser.mq5"
|
||||
#include "./Brent/x-saherelm.x121.amarkets.brent.short.parser.mq5"
|
||||
#include "./DowJones/x-saherelm.x121.amarkets.us30.long.parser.mq5"
|
||||
#include "./DowJones/x-saherelm.x121.amarkets.us30.short.parser.mq5"
|
||||
// #include "./DowJones/x-saherelm.x121.amarkets.us30.long.parser.mq5"
|
||||
// #include "./DowJones/x-saherelm.x121.amarkets.us30.short.parser.mq5"
|
||||
#include "./EURGBP/x-saherelm.x121.amarkets.eurgbp.long.parser.mq5"
|
||||
#include "./EURGBP/x-saherelm.x121.amarkets.eurgbp.short.parser.mq5"
|
||||
#include "./EURJPY/x-saherelm.x121.amarkets.eurjpy.long.parser.mq5"
|
||||
@@ -47,16 +47,16 @@
|
||||
#include "./USDCAD/x-saherelm.x121.amarkets.usdcad.short.parser.mq5"
|
||||
#include "./EURCAD/x-saherelm.x121.amarkets.eurcad.long.parser.mq5"
|
||||
#include "./EURCAD/x-saherelm.x121.amarkets.eurcad.short.parser.mq5"
|
||||
#include "./EURUSD/x-saherelm.x121.amarkets.eurusd.long.parser.mq5"
|
||||
#include "./EURUSD/x-saherelm.x121.amarkets.eurusd.short.parser.mq5"
|
||||
#include "./USDJPY/x-saherelm.x121.amarkets.usdjpy.long.parser.mq5"
|
||||
#include "./USDJPY/x-saherelm.x121.amarkets.usdjpy.short.parser.mq5"
|
||||
#include "./USDCHF/x-saherelm.x121.amarkets.usdchf.long.parser.mq5"
|
||||
#include "./USDCHF/x-saherelm.x121.amarkets.usdchf.short.parser.mq5"
|
||||
#include "./GBPUSD/x-saherelm.x121.amarkets.gbpusd.long.parser.mq5"
|
||||
#include "./GBPUSD/x-saherelm.x121.amarkets.gbpusd.short.parser.mq5"
|
||||
#include "./XAUUSD/x-saherelm.x121.amarkets.xauusd.long.parser.mq5"
|
||||
#include "./XAUUSD/x-saherelm.x121.amarkets.xauusd.short.parser.mq5"
|
||||
// #include "./EURUSD/x-saherelm.x121.amarkets.eurusd.long.parser.mq5"
|
||||
// #include "./EURUSD/x-saherelm.x121.amarkets.eurusd.short.parser.mq5"
|
||||
// #include "./USDJPY/x-saherelm.x121.amarkets.usdjpy.long.parser.mq5"
|
||||
// #include "./USDJPY/x-saherelm.x121.amarkets.usdjpy.short.parser.mq5"
|
||||
// #include "./USDCHF/x-saherelm.x121.amarkets.usdchf.long.parser.mq5"
|
||||
// #include "./USDCHF/x-saherelm.x121.amarkets.usdchf.short.parser.mq5"
|
||||
// #include "./GBPUSD/x-saherelm.x121.amarkets.gbpusd.long.parser.mq5"
|
||||
// #include "./GBPUSD/x-saherelm.x121.amarkets.gbpusd.short.parser.mq5"
|
||||
// #include "./XAUUSD/x-saherelm.x121.amarkets.xauusd.long.parser.mq5"
|
||||
// #include "./XAUUSD/x-saherelm.x121.amarkets.xauusd.short.parser.mq5"
|
||||
#include "./XAGUSD/x-saherelm.x121.amarkets.xagusd.long.parser.mq5"
|
||||
#include "./XAGUSD/x-saherelm.x121.amarkets.xagusd.short.parser.mq5"
|
||||
|
||||
@@ -73,13 +73,13 @@ struct X121StartegyAMarketsConditionsParser
|
||||
|
||||
//
|
||||
// EURUSD ...
|
||||
X121StartegyAMarketsEURUSDLongConditionsParser _eurusdLongParser;
|
||||
X121StartegyAMarketsEURUSDShortConditionsParser _eurusdShortParser;
|
||||
// X121StartegyAMarketsEURUSDLongConditionsParser _eurusdLongParser;
|
||||
// X121StartegyAMarketsEURUSDShortConditionsParser _eurusdShortParser;
|
||||
|
||||
//
|
||||
// GBPUSD ...
|
||||
X121StartegyAMarketsGBPUSDLongConditionsParser _gbpusdLongParser;
|
||||
X121StartegyAMarketsGBPUSDShortConditionsParser _gbpusdShortParser;
|
||||
// X121StartegyAMarketsGBPUSDLongConditionsParser _gbpusdLongParser;
|
||||
// X121StartegyAMarketsGBPUSDShortConditionsParser _gbpusdShortParser;
|
||||
|
||||
//
|
||||
// EURGBP ...
|
||||
@@ -88,8 +88,8 @@ struct X121StartegyAMarketsConditionsParser
|
||||
|
||||
//
|
||||
// USDJPY ...
|
||||
X121StartegyAMarketsUSDJPYLongConditionsParser _usdjpyLongParser;
|
||||
X121StartegyAMarketsUSDJPYShortConditionsParser _usdjpyShortParser;
|
||||
// X121StartegyAMarketsUSDJPYLongConditionsParser _usdjpyLongParser;
|
||||
// X121StartegyAMarketsUSDJPYShortConditionsParser _usdjpyShortParser;
|
||||
|
||||
//
|
||||
// EURJPY ...
|
||||
@@ -98,8 +98,8 @@ struct X121StartegyAMarketsConditionsParser
|
||||
|
||||
//
|
||||
// USDCHF ...
|
||||
X121StartegyAMarketsUSDCHFLongConditionsParser _usdchfLongParser;
|
||||
X121StartegyAMarketsUSDCHFShortConditionsParser _usdchfShortParser;
|
||||
// X121StartegyAMarketsUSDCHFLongConditionsParser _usdchfLongParser;
|
||||
// X121StartegyAMarketsUSDCHFShortConditionsParser _usdchfShortParser;
|
||||
|
||||
//
|
||||
// EURCHF ...
|
||||
@@ -108,8 +108,8 @@ struct X121StartegyAMarketsConditionsParser
|
||||
|
||||
//
|
||||
// XAUUSD ...
|
||||
X121StartegyAMarketsXAUUSDLongConditionsParser _xauusdLongParser;
|
||||
X121StartegyAMarketsXAUUSDShortConditionsParser _xauusdShortParser;
|
||||
// X121StartegyAMarketsXAUUSDLongConditionsParser _xauusdLongParser;
|
||||
// X121StartegyAMarketsXAUUSDShortConditionsParser _xauusdShortParser;
|
||||
|
||||
//
|
||||
// XAGUSD ...
|
||||
@@ -148,8 +148,8 @@ struct X121StartegyAMarketsConditionsParser
|
||||
|
||||
//
|
||||
// DOWJONES ...
|
||||
X121StartegyAMarketsUS30LongConditionsParser _dowjonesLongParser;
|
||||
X121StartegyAMarketsUS30ShortConditionsParser _dowjonesShortParser;
|
||||
// X121StartegyAMarketsUS30LongConditionsParser _dowjonesLongParser;
|
||||
// X121StartegyAMarketsUS30ShortConditionsParser _dowjonesShortParser;
|
||||
|
||||
//
|
||||
// BRENT ...
|
||||
@@ -230,38 +230,43 @@ struct X121StartegyAMarketsConditionsParser
|
||||
bool isDowJones = _symbolParser.IsDowJones(signal.symbol);
|
||||
|
||||
//
|
||||
bool isEURUSDFiltered = _eurusdLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isGBPUSDFiltered = _gbpusdLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isEURUSDFiltered = false;
|
||||
// _eurusdLongParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isGBPUSDFiltered = false;
|
||||
// _gbpusdLongParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isEURGBPFiltered = _eurgbpLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDJPYFiltered = _usdjpyLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDJPYFiltered = false;
|
||||
// _usdjpyLongParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isEURJPYFiltered = _eurjpyLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDCHFFiltered = _usdchfLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDCHFFiltered = false;
|
||||
// _usdchfLongParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isEURCHFFiltered = _eurchfLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isXAUUSDFiltered = _xauusdLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isXAUUSDFiltered = false;
|
||||
// _xauusdLongParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isXAGUSDFiltered = _xagusdLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
@@ -290,10 +295,11 @@ struct X121StartegyAMarketsConditionsParser
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isDowJonesFiltered = _dowjonesLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isDowJonesFiltered = false;
|
||||
// _dowjonesLongParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isBrentFiltered = _brentLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
@@ -481,38 +487,43 @@ struct X121StartegyAMarketsConditionsParser
|
||||
bool isDowJones = _symbolParser.IsDowJones(signal.symbol);
|
||||
|
||||
//
|
||||
bool isEURUSDFiltered = _eurusdShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isGBPUSDFiltered = _gbpusdShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isEURUSDFiltered = false;
|
||||
// _eurusdShortParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isGBPUSDFiltered = false;
|
||||
// _gbpusdShortParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isEURGBPFiltered = _eurgbpShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDJPYFiltered = _usdjpyShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDJPYFiltered = false;
|
||||
// _usdjpyShortParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isEURJPYFiltered = _eurjpyShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDCHFFiltered = _usdchfShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDCHFFiltered = false;
|
||||
// _usdchfShortParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isEURCHFFiltered = _eurchfShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isXAUUSDFiltered = _xauusdShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isXAUUSDFiltered = false;
|
||||
// _xauusdShortParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
bool isXAGUSDFiltered = _xagusdShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
@@ -545,10 +556,11 @@ struct X121StartegyAMarketsConditionsParser
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isDowJonesFiltered = _dowjonesShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isDowJonesFiltered = false;
|
||||
// _dowjonesShortParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions //
|
||||
// );
|
||||
|
||||
//
|
||||
if (!force)
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
// #include "./Ingot/x-saherelm.x121.ingot.parser.mq5"
|
||||
// #include "./Alpari/x-saherelm.x121.alpari.parser.mq5"
|
||||
// #include "./Errante/x-saherelm.x121.errante.parser.mq5"
|
||||
// #include "./AMarkets/x-saherelm.x121.amarkets.parser.mq5"
|
||||
#include "./AMarkets/x-saherelm.x121.amarkets.parser.mq5"
|
||||
// #include "./IFCMarkets/x-saherelm.x121.ifcmarkets.parser.mq5"
|
||||
// #include "./OtetMarkets/x-saherelm.x121.otetmarkets.parser.mq5"
|
||||
|
||||
@@ -50,7 +50,7 @@ struct X121StartegyConditionsParser
|
||||
// XCHICHWAPStartegyIngotConditionsParser _ingotParser;
|
||||
// XCHICHWAPStartegyAlpariConditionsParser _alpariParser;
|
||||
// XCHICHWAPStartegyErranteConditionsParser _erranteParser;
|
||||
// X121StartegyAMarketsConditionsParser _amarketsParser;
|
||||
X121StartegyAMarketsConditionsParser _amarketsParser;
|
||||
// XCHICHWAPStartegyIFCMarketsConditionsParser _ifcmarketsParser;
|
||||
// XCHICHWAPStartegyOtetMarketsConditionsParser _otetmarketsParser;
|
||||
|
||||
@@ -622,12 +622,11 @@ struct X121StartegyConditionsParser
|
||||
|
||||
//
|
||||
// AMarkets ...
|
||||
bool isAMarketsFiltered = false;
|
||||
// _amarketsParser.IsFiltered(
|
||||
// signal,
|
||||
// conditions,
|
||||
// force //
|
||||
// );
|
||||
bool isAMarketsFiltered = _amarketsParser.IsFiltered(
|
||||
signal,
|
||||
conditions,
|
||||
force //
|
||||
);
|
||||
|
||||
//
|
||||
// IFCMarkets ...
|
||||
|
||||
Reference in New Issue
Block a user