Add all Requirements for new Assets: EURAUD, EURNZD, XAGUSD and BREN in AMarkets Parser ...
This commit is contained in:
@@ -25,6 +25,8 @@
|
||||
#include "../../Strategies/x-saherelm.xch.strategy.mq5"
|
||||
|
||||
//
|
||||
#include "./Brent/x-saherelm.xch.amarkets.brent.long.parser.mq5"
|
||||
#include "./Brent/x-saherelm.xch.amarkets.brent.short.parser.mq5"
|
||||
#include "./DowJones/x-saherelm.xch.amarkets.us30.long.parser.mq5"
|
||||
#include "./DowJones/x-saherelm.xch.amarkets.us30.short.parser.mq5"
|
||||
#include "./EURGBP/x-saherelm.xch.amarkets.eurgbp.long.parser.mq5"
|
||||
@@ -35,8 +37,12 @@
|
||||
#include "./EURCHF/x-saherelm.xch.amarkets.eurchf.short.parser.mq5"
|
||||
#include "./AUDUSD/x-saherelm.xch.amarkets.audusd.long.parser.mq5"
|
||||
#include "./AUDUSD/x-saherelm.xch.amarkets.audusd.short.parser.mq5"
|
||||
#include "./EURAUD/x-saherelm.xch.amarkets.euraud.long.parser.mq5"
|
||||
#include "./EURAUD/x-saherelm.xch.amarkets.euraud.short.parser.mq5"
|
||||
#include "./NZDUSD/x-saherelm.xch.amarkets.nzdusd.long.parser.mq5"
|
||||
#include "./NZDUSD/x-saherelm.xch.amarkets.nzdusd.short.parser.mq5"
|
||||
#include "./EURNZD/x-saherelm.xch.amarkets.eurnzd.long.parser.mq5"
|
||||
#include "./EURNZD/x-saherelm.xch.amarkets.eurnzd.short.parser.mq5"
|
||||
#include "./USDCAD/x-saherelm.xch.amarkets.usdcad.long.parser.mq5"
|
||||
#include "./USDCAD/x-saherelm.xch.amarkets.usdcad.short.parser.mq5"
|
||||
#include "./EURCAD/x-saherelm.xch.amarkets.eurcad.long.parser.mq5"
|
||||
@@ -51,6 +57,8 @@
|
||||
#include "./GBPUSD/x-saherelm.xch.amarkets.gbpusd.short.parser.mq5"
|
||||
#include "./XAUUSD/x-saherelm.xch.amarkets.xauusd.long.parser.mq5"
|
||||
#include "./XAUUSD/x-saherelm.xch.amarkets.xauusd.short.parser.mq5"
|
||||
#include "./XAGUSD/x-saherelm.xch.amarkets.xagusd.long.parser.mq5"
|
||||
#include "./XAGUSD/x-saherelm.xch.amarkets.xagusd.short.parser.mq5"
|
||||
|
||||
//
|
||||
// Conditions Parser ...
|
||||
@@ -104,20 +112,30 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
XCHStartegyAMarketsXAUUSDShortConditionsParser _xauusdShortParser;
|
||||
|
||||
//
|
||||
// DOWJONES ...
|
||||
XCHStartegyAMarketsUS30LongConditionsParser _dowjonesLongParser;
|
||||
XCHStartegyAMarketsUS30ShortConditionsParser _dowjonesShortParser;
|
||||
// XAGUSD ...
|
||||
XCHStartegyAMarketsXAGUSDLongConditionsParser _xagusdLongParser;
|
||||
XCHStartegyAMarketsXAGUSDShortConditionsParser _xagusdShortParser;
|
||||
|
||||
//
|
||||
// AUDUSD ...
|
||||
XCHStartegyAMarketsAUDUSDLongConditionsParser _audusdLongParser;
|
||||
XCHStartegyAMarketsAUDUSDShortConditionsParser _audusdShortParser;
|
||||
|
||||
//
|
||||
// EURAUD ...
|
||||
XCHStartegyAMarketsEURAUDLongConditionsParser _euraudLongParser;
|
||||
XCHStartegyAMarketsEURAUDShortConditionsParser _euraudShortParser;
|
||||
|
||||
//
|
||||
// NZDUSD ...
|
||||
XCHStartegyAMarketsNZDUSDLongConditionsParser _nzdusdLongParser;
|
||||
XCHStartegyAMarketsNZDUSDShortConditionsParser _nzdusdShortParser;
|
||||
|
||||
//
|
||||
// EURNZD ...
|
||||
XCHStartegyAMarketsEURNZDLongConditionsParser _eurnzdLongParser;
|
||||
XCHStartegyAMarketsEURNZDShortConditionsParser _eurnzdShortParser;
|
||||
|
||||
//
|
||||
// USDCAD ...
|
||||
XCHStartegyAMarketsUSDCADLongConditionsParser _usdcadLongParser;
|
||||
@@ -128,6 +146,16 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
XCHStartegyAMarketsEURCADLongConditionsParser _eurcadLongParser;
|
||||
XCHStartegyAMarketsEURCADShortConditionsParser _eurcadShortParser;
|
||||
|
||||
//
|
||||
// DOWJONES ...
|
||||
XCHStartegyAMarketsUS30LongConditionsParser _dowjonesLongParser;
|
||||
XCHStartegyAMarketsUS30ShortConditionsParser _dowjonesShortParser;
|
||||
|
||||
//
|
||||
// BRENT ...
|
||||
XCHStartegyAMarketsBRENTLongConditionsParser _brentLongParser;
|
||||
XCHStartegyAMarketsBRENTShortConditionsParser _brentShortParser;
|
||||
|
||||
//
|
||||
bool IsFiltered(
|
||||
XSignal &signal, // Provided Signal
|
||||
@@ -187,14 +215,18 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
bool isGBPUSD = _symbolParser.IsGBPUSD(signal.symbol);
|
||||
bool isEURGBP = _symbolParser.IsEURGBP(signal.symbol);
|
||||
bool isXAUUSD = _symbolParser.IsXAUUSD(signal.symbol);
|
||||
bool isXAGUSD = _symbolParser.IsXAGUSD(signal.symbol);
|
||||
bool isUSDJPY = _symbolParser.IsUSDJPY(signal.symbol);
|
||||
bool isEURJPY = _symbolParser.IsEURJPY(signal.symbol);
|
||||
bool isUSDCHF = _symbolParser.IsUSDCHF(signal.symbol);
|
||||
bool isEURCHF = _symbolParser.IsEURCHF(signal.symbol);
|
||||
bool isAUDUSD = _symbolParser.IsAUDUSD(signal.symbol);
|
||||
bool isEURAUD = _symbolParser.IsEURAUD(signal.symbol);
|
||||
bool isNZDUSD = _symbolParser.IsNZDUSD(signal.symbol);
|
||||
bool isEURNZD = _symbolParser.IsEURNZD(signal.symbol);
|
||||
bool isUSDCAD = _symbolParser.IsUSDCAD(signal.symbol);
|
||||
bool isEURCAD = _symbolParser.IsEURCAD(signal.symbol);
|
||||
bool isBrent = _symbolParser.IsBrent(signal.symbol);
|
||||
bool isDowJones = _symbolParser.IsDowJones(signal.symbol);
|
||||
|
||||
//
|
||||
@@ -230,14 +262,26 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isXAGUSDFiltered = _xagusdLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isAUDUSDFiltered = _audusdLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isEURAUDFiltered = _euraudLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isNZDUSDFiltered = _nzdusdLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isEURNZDFiltered = _eurnzdLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDCADFiltered = _usdcadLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
@@ -250,6 +294,10 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isBrentFiltered = _brentLongParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
|
||||
//
|
||||
if (!force)
|
||||
@@ -287,14 +335,26 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
{
|
||||
result = isXAUUSDFiltered;
|
||||
}
|
||||
else if (isXAGUSD)
|
||||
{
|
||||
result = isXAGUSDFiltered;
|
||||
}
|
||||
else if (isAUDUSD)
|
||||
{
|
||||
result = isAUDUSDFiltered;
|
||||
}
|
||||
else if (isEURAUD)
|
||||
{
|
||||
result = isEURAUDFiltered;
|
||||
}
|
||||
else if (isNZDUSD)
|
||||
{
|
||||
result = isNZDUSDFiltered;
|
||||
}
|
||||
else if (isEURNZD)
|
||||
{
|
||||
result = isEURNZDFiltered;
|
||||
}
|
||||
else if (isUSDCAD)
|
||||
{
|
||||
result = isUSDCADFiltered;
|
||||
@@ -303,6 +363,10 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
{
|
||||
result = isEURCADFiltered;
|
||||
}
|
||||
else if (isBrent)
|
||||
{
|
||||
result = isBrentFiltered;
|
||||
}
|
||||
else if (isDowJones)
|
||||
{
|
||||
result = isDowJonesFiltered;
|
||||
@@ -345,14 +409,26 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
//
|
||||
||
|
||||
//
|
||||
isXAGUSDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isAUDUSDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isEURAUDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isNZDUSDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isEURNZDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isUSDCADFiltered
|
||||
//
|
||||
||
|
||||
@@ -361,6 +437,10 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
//
|
||||
||
|
||||
//
|
||||
isBrentFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isDowJonesFiltered
|
||||
//
|
||||
;
|
||||
@@ -386,14 +466,18 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
bool isGBPUSD = _symbolParser.IsGBPUSD(signal.symbol);
|
||||
bool isEURGBP = _symbolParser.IsEURGBP(signal.symbol);
|
||||
bool isXAUUSD = _symbolParser.IsXAUUSD(signal.symbol);
|
||||
bool isXAGUSD = _symbolParser.IsXAGUSD(signal.symbol);
|
||||
bool isUSDJPY = _symbolParser.IsUSDJPY(signal.symbol);
|
||||
bool isEURJPY = _symbolParser.IsEURJPY(signal.symbol);
|
||||
bool isUSDCHF = _symbolParser.IsUSDCHF(signal.symbol);
|
||||
bool isEURCHF = _symbolParser.IsEURCHF(signal.symbol);
|
||||
bool isAUDUSD = _symbolParser.IsAUDUSD(signal.symbol);
|
||||
bool isEURAUD = _symbolParser.IsEURAUD(signal.symbol);
|
||||
bool isNZDUSD = _symbolParser.IsNZDUSD(signal.symbol);
|
||||
bool isEURNZD = _symbolParser.IsEURNZD(signal.symbol);
|
||||
bool isUSDCAD = _symbolParser.IsUSDCAD(signal.symbol);
|
||||
bool isEURCAD = _symbolParser.IsEURCAD(signal.symbol);
|
||||
bool isBrent = _symbolParser.IsBrent(signal.symbol);
|
||||
bool isDowJones = _symbolParser.IsDowJones(signal.symbol);
|
||||
|
||||
//
|
||||
@@ -429,14 +513,26 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isXAGUSDFiltered = _xagusdShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isAUDUSDFiltered = _audusdShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isEURAUDFiltered = _euraudShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isNZDUSDFiltered = _nzdusdShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isEURNZDFiltered = _eurnzdShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isUSDCADFiltered = _usdcadShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
@@ -445,6 +541,10 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isBrentFiltered = _brentShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
);
|
||||
bool isDowJonesFiltered = _dowjonesShortParser.IsFiltered(
|
||||
signal,
|
||||
conditions //
|
||||
@@ -486,14 +586,26 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
{
|
||||
result = isXAUUSDFiltered;
|
||||
}
|
||||
else if (isXAGUSD)
|
||||
{
|
||||
result = isXAGUSDFiltered;
|
||||
}
|
||||
else if (isAUDUSD)
|
||||
{
|
||||
result = isAUDUSDFiltered;
|
||||
}
|
||||
else if (isEURAUD)
|
||||
{
|
||||
result = isEURAUDFiltered;
|
||||
}
|
||||
else if (isNZDUSD)
|
||||
{
|
||||
result = isNZDUSDFiltered;
|
||||
}
|
||||
else if (isEURNZD)
|
||||
{
|
||||
result = isEURNZDFiltered;
|
||||
}
|
||||
else if (isUSDCAD)
|
||||
{
|
||||
result = isUSDCADFiltered;
|
||||
@@ -502,6 +614,10 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
{
|
||||
result = isEURCADFiltered;
|
||||
}
|
||||
else if (isBrent)
|
||||
{
|
||||
result = isBrentFiltered;
|
||||
}
|
||||
else if (isDowJones)
|
||||
{
|
||||
result = isDowJonesFiltered;
|
||||
@@ -544,14 +660,26 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
//
|
||||
||
|
||||
//
|
||||
isXAGUSDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isAUDUSDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isEURAUDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isNZDUSDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isEURNZDFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isUSDCADFiltered
|
||||
//
|
||||
||
|
||||
@@ -560,6 +688,10 @@ struct XCHStartegyAMarketsConditionsParser
|
||||
//
|
||||
||
|
||||
//
|
||||
isBrentFiltered
|
||||
//
|
||||
||
|
||||
//
|
||||
isDowJonesFiltered
|
||||
//
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user