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 ...
#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
//
;
}