This commit is contained in:
2024-08-24 19:38:24 +03:30
parent e40ef79230
commit c3b95677fe
+13 -11
View File
@@ -24,6 +24,9 @@
// Imports ... // Imports ...
#include "../Strategies/x-saherelm.xch.che.strategy.mq5" #include "../Strategies/x-saherelm.xch.che.strategy.mq5"
//
#include "./AMarkets/x-saherelm.xch.che.amarkets.parser.mq5"
// //
// Conditions Parser ... // Conditions Parser ...
struct XCHCHEStartegyConditionsParser struct XCHCHEStartegyConditionsParser
@@ -38,6 +41,9 @@ struct XCHCHEStartegyConditionsParser
XSCAccount _account; XSCAccount _account;
XMarketParser _marketParser; XMarketParser _marketParser;
//
XCHCHEStartegyAMarketsConditionsParser _amarketsParser;
// //
string GenerateSignalConditions( string GenerateSignalConditions(
XSignal &signal, XSignal &signal,
@@ -992,27 +998,23 @@ struct XCHCHEStartegyConditionsParser
bool isAMarkets = _marketParser.IsAMarkets(market); bool isAMarkets = _marketParser.IsAMarkets(market);
// //
// bool isAMarketFiltered = _amarketsParser.IsFiltered( bool isAMarketFiltered = _amarketsParser.IsFiltered(
// signal, signal,
// conditions, conditions,
// force // force //
// ); );
// //
if (!force) if (!force)
{ {
// result = isAMarketFiltered; result = isAMarketFiltered;
} }
else else
{ {
// //
result = result =
// //
// isAMarketFiltered isAMarketFiltered
// //
// ||
//
false
// //
; ;
} }