diff --git a/Parsers/x-saherelm.xch.che.parser.mq5 b/Parsers/x-saherelm.xch.che.parser.mq5 index 5173cf94..39d58eb9 100644 --- a/Parsers/x-saherelm.xch.che.parser.mq5 +++ b/Parsers/x-saherelm.xch.che.parser.mq5 @@ -24,6 +24,9 @@ // Imports ... #include "../Strategies/x-saherelm.xch.che.strategy.mq5" +// +#include "./AMarkets/x-saherelm.xch.che.amarkets.parser.mq5" + // // Conditions Parser ... struct XCHCHEStartegyConditionsParser @@ -38,6 +41,9 @@ struct XCHCHEStartegyConditionsParser XSCAccount _account; XMarketParser _marketParser; + // + XCHCHEStartegyAMarketsConditionsParser _amarketsParser; + // string GenerateSignalConditions( XSignal &signal, @@ -992,27 +998,23 @@ struct XCHCHEStartegyConditionsParser bool isAMarkets = _marketParser.IsAMarkets(market); // - // bool isAMarketFiltered = _amarketsParser.IsFiltered( - // signal, - // conditions, - // force // - // ); + bool isAMarketFiltered = _amarketsParser.IsFiltered( + signal, + conditions, + force // + ); // if (!force) { - // result = isAMarketFiltered; + result = isAMarketFiltered; } else { // result = // - // isAMarketFiltered - // // - // || - // - false + isAMarketFiltered // ; }