saherelm/MQL5Data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply Fix on Strategy Parse and Filtering ...

Browse Source
This commit is contained in:
saherelm
2024-09-15 17:34:37 +03:30
parent 7ab8046543
commit 6aa7388127
3 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Experts/x-saherelm.x121.ea.mq5
+30 -36
View File
@@ -831,11 +831,24 @@ void OnSignalRecieved(
// Strategy and it's not related to Public
// TradeHandler for Seperation of Concern issue,
// we do this here ...
XCHCHEStartegyConditionsParser parser;
bool isFiltered = parser.IsFiltered(
signal,
conditions //
);
XCHStartegyConditionsParser chParser;
XCHCHEStartegyConditionsParser chcheParser;
//
bool isXCHSignal = signal.provider == XCHStartegyToken;
bool isXCHCHESignal = signal.provider == XCHCHEStartegyToken;
bool isFiltered =
isXCHSignal
? chParser.IsFiltered(
signal,
conditions //
)
: isXCHCHESignal
? chcheParser.IsFiltered(
signal,
conditions //
)
: true;
if (isFiltered)
{
//
@@ -843,33 +856,6 @@ void OnSignalRecieved(
return;
}
// //
// // Here we Can Increase Signal Volume if
// // it is not force Filtered ...
// bool isForceFiltered = parser.IsFiltered(
// signal,
// conditions,
// true //
// );
// if (!isForceFiltered)
// {
// //
// // TODO:
// // Implement Strong Signals Conditions
// // Senarios ...
// forceSignalsCount++;
// //
// // Alert Froce Strong Signals
// // if Provided ...
// if (eaAlertStrongSignals)
// {
// //
// string msg = "Foce Strong " + (IsLong(signal.type) ? "Long" : "Short") + " Signal Recieved: (" + signal.provider + "," + signal.symbol + "," + ToString(signal.period) + ") ...";
// eaAlert.Alert(msg);
// }
// }
//
// Attach Conditions Summary to Signal ...
string conditionsSummary = conditions.GenerateSummary(
@@ -880,10 +866,18 @@ void OnSignalRecieved(
);
//
signal.conditions = parser.GenerateSignalConditions(
signal,
conditions //
); // conditionsSummary;
signal.conditions =
isXCHSignal
? chParser.GenerateSignalConditions(
signal,
conditions //
)
: isXCHCHESignal
? chcheParser.GenerateSignalConditions(
signal,
conditions //
)
: conditionsSummary;
//
// Execute Signal Using Trade Handler ...
Strategies/x-saherelm.xch.che.strategy.mq5
+4
View File
@@ -643,6 +643,10 @@ public:
return result;
}
//
// Attach Strategy Lebel ...
signal.provider = XCHCHEStartegyToken;
//
// Notify XCH Specified Signal Event Handlers ...
NotifyOnXCHSignalEventHandlers(
Strategies/x-saherelm.xch.strategy.mq5
+4
View File
@@ -1312,6 +1312,10 @@ public:
return result;
}
//
// Attach Strategy Lebel ...
signal.provider = XCHStartegyToken;
//
// Notify XCH Specified Signal Event Handlers ...
NotifyOnXCHSignalEventHandlers(