last ...

2024-08-23 03:24:33 +03:30
parent 6ede00b304
commit c3eeb005f1
62 changed files with 5257 additions and 450 deletions
@@ -24,26 +24,49 @@
 // Imports ...
 #include "../../../Strategies/x-saherelm.xch.strategy.mq5"

+//
+#include "./Olds/x-saherelm.xch.amarkets.audusd.olds.short.parser.mq5"
+#include "./2019/x-saherelm.xch.amarkets.audusd.2019.short.parser.mq5"
+
 //
 // Conditions Parser ...
 struct XCHStartegyAMarketsAUDUSDShortConditionsParser
 {
    //
    string _version;
+
+    //
+    XCHStartegyAMarketsAUDUSDOldsShortConditionsParser _oldsParser;
+    XCHStartegyAMarketsAUDUSD2019ShortConditionsParser _2019Parser;
+
    //
    bool IsFiltered(
-        XCHStrategyConditions &conditions //
+        XSignal &signal,
+        XCHStrategyConditions &conditions,
+        bool force = true //
    )
    {
        //
        bool result = false;

        //
-        result =
+        if (!force)
+        {
+            result = _2019Parser.IsFiltered(conditions);
+        }
+        else
+        {
            //
-            false
-            //
-            ;
+            result =
+                //
+                _2019Parser.IsFiltered(conditions)
+                //
+                ||
+                //
+                _oldsParser.IsFiltered(conditions)
+                //
+                ;
+        }

        //
        return result;