Apply 1r1 GBPUSDb Level 1 fix ...

Strategies/x-saherelm.xch.che.strategy.mq5

@@ -329,6 +329,36 @@ public:
         //
         // Common Conditions For Bullish and Bearish Powers ...
 
+        //
+        // For Trend ...
+        XOHCL tmpHSW[];
+        XOHCL tmpLSW[];
+
+        //
+        // Detect Bullish/Bearish Patterns and Trends ...
+
+        //
+        // Bullish ...
+        bool hasBullishPower = cBar.HasBullishPower();
+        bool hasBullishPattern = HasBullishPattern(cBar);
+        bool hasBullishPressure = cBar.HasBullishPressure();
+        bool isBullishTrend = cBar.HasBullishTrend(
+            tmpHSW,
+            tmpLSW,
+            true //
+        );
+
+        //
+        // Bearish ...
+        bool hasBearishPower = cBar.HasBearishPower();
+        bool hasBearishPattern = HasBearishPattern(cBar);
+        bool hasBearishPressure = cBar.HasBearishPressure();
+        bool isBearishTrend = cBar.HasBearishTrend(
+            tmpHSW,
+            tmpLSW,
+            false //
+        );
+
         //
         bool notHaveBearishPower = (!chmConditions.hasBearishPower &&
                                     !chhkConditions.hasBearishPower &&
@@ -351,10 +381,18 @@ public:
         bool isCHHKFullSwitchedToBullish =
             chhkHelper.IsSwitchedToBullish(cIndex);
 
+        //
+        bool isCHHKFullBullishAndSorted =
+            chhkHelper.IsBullishSorted(cIndex);
+
         //
         bool isCHHKFullSwitchedToBearish =
             chhkHelper.IsSwitchedToBearish(cIndex);
 
+        //
+        bool isCHHKFullBearishAndSorted =
+            chhkHelper.IsBearishSorted(cIndex);
+
         //
         bool isBearishPowerDecreasing =
             //
@@ -410,12 +448,18 @@ public:
         //
         // Detecting Signals ...
 
+        //
+        // First Conditions ...
+
         //
         bool hasLong1 =
             //
+            isBullishTrend &&
+            (hasBullishPower ||
+             hasBullishPattern ||
+             hasBullishPressure) &&
             hasBullishDecision &&
             notHaveBearishPower &&
-            isBearishPowerDecreasing &&
             isCHHKFullSwitchedToBullish
             //
             ;
@@ -424,7 +468,7 @@ public:
             //
             pushers++;
             Add(
-                "XCHHKE",
+                "XCHHKE1",
                 signallers //
             );
 
@@ -436,9 +480,12 @@ public:
         //
         bool hasShort1 =
             //
+            isBearishTrend &&
+            (hasBearishPower ||
+             hasBearishPattern ||
+             hasBearishPressure) &&
             hasBearishDecision &&
             notHaveBullishPower &&
-            isBullishPowerDecreasing &&
             isCHHKFullSwitchedToBearish
             //
             ;
@@ -447,7 +494,62 @@ public:
             //
             pushers++;
             Add(
-                "XCHHKE",
+                "XCHHKE1",
+                signallers //
+            );
+
+            //
+            sl = short1SL;
+            type = POSITION_TYPE_SELL;
+        }
+
+        //
+        // Second Condition ...
+
+        //
+        bool hasLong2 =
+            //
+            // isBullishTrend &&
+            // (hasBullishPower ||
+            //  hasBullishPattern ||
+            //  hasBullishPressure) &&
+            // hasBullishDecision &&
+            // notHaveBearishPower &&
+            isCHHKFullBullishAndSorted
+            //
+            ;
+        if (hasLong2)
+        {
+            //
+            pushers++;
+            Add(
+                "XCHHKE2",
+                signallers //
+            );
+
+            //
+            sl = long1SL;
+            type = POSITION_TYPE_BUY;
+        }
+
+        //
+        bool hasShort2 =
+            //
+            // isBearishTrend &&
+            // (hasBearishPower ||
+            //  hasBearishPattern ||
+            //  hasBearishPressure) &&
+            // hasBearishDecision &&
+            // notHaveBullishPower &&
+            isCHHKFullBearishAndSorted
+            //
+            ;
+        if (hasShort2)
+        {
+            //
+            pushers++;
+            Add(
+                "XCHHKE2",
                 signallers //
             );
 
@@ -459,14 +561,22 @@ public:
         //
         hasLong =
             //
-            hasLong1
+            // hasLong1
+            // //
+            // ||
+            //
+            hasLong2
             //
             ;
 
         //
         hasShort =
             //
-            hasShort1
+            // hasShort1
+            // //
+            // ||
+            //
+            hasShort2
             //
             ;