last ...

X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5

@@ -450,22 +450,26 @@ class XC121SMCCycleHelper : public XCBase
         //
         int highestPeakIndex = -1;
         double highestPeakVale = 0;
-        double highestPeak = mX121Helper
-                                 .GetHighestPeak(
-                                     barIndex,
-                                     highestPeakIndex,
-                                     highestPeakVale //
-                                 );
+        double highestPeak =
+            mX121Helper
+                .xpvHelper
+                .GetHighestPeak(
+                    barIndex,
+                    highestPeakIndex,
+                    highestPeakVale //
+                );
 
         //
         int lowestValeIndex = -1;
         double lowestValePeak = 0;
-        double lowestVale = mX121Helper
-                                .GetLowestVale(
-                                    barIndex,
-                                    lowestValeIndex,
-                                    lowestValePeak //
-                                );
+        double lowestVale =
+            mX121Helper
+                .xpvHelper
+                .GetLowestVale(
+                    barIndex,
+                    lowestValeIndex,
+                    lowestValePeak //
+                );
 
         //
         result = IsValidIndex(highestPeakIndex) &&
@@ -520,7 +524,11 @@ class XC121SMCCycleHelper : public XCBase
             }
 
             //
-            bool isBreake = iBar.IsBreakeUp(lowestValePeak);
+            bool isBreake = IsBarBreak(
+                lowestValePeak,
+                X_DIRECTION_BULLISH,
+                iBar //
+            );
             if (isBreake)
             {
                 //
@@ -545,7 +553,11 @@ class XC121SMCCycleHelper : public XCBase
             }
 
             //
-            bool isBreake = iBar.IsBreakeDown(highestPeakVale);
+            bool isBreake = IsBarBreak(
+                highestPeakVale,
+                X_DIRECTION_BEARISH,
+                iBar //
+            );
             if (isBreake)
             {
                 //
@@ -571,7 +583,7 @@ class XC121SMCCycleHelper : public XCBase
         for (int i = lowestValePeakBreakeUpIndex; i >= barIndex; i--)
         {
             //
-            double iVale = mX121Helper.GetVale(i);
+            double iVale = mX121Helper.xpvHelper.GetVale(i);
 
             //
             bool isValid =
@@ -581,7 +593,7 @@ class XC121SMCCycleHelper : public XCBase
             {
                 //
                 valeAboveLowestValePeakIndex = i;
-                valeAboveLowestValePeakPeak = mX121Helper.GetPeak(i);
+                valeAboveLowestValePeakPeak = mX121Helper.xpvHelper.GetPeak(i);
                 break;
             }
         }
@@ -595,7 +607,7 @@ class XC121SMCCycleHelper : public XCBase
         for (int i = highestPeakValeBreakeDownIndex; i >= barIndex; i--)
         {
             //
-            double iPeak = mX121Helper.GetPeak(i);
+            double iPeak = mX121Helper.xpvHelper.GetPeak(i);
 
             //
             bool isValid =
@@ -605,7 +617,7 @@ class XC121SMCCycleHelper : public XCBase
             {
                 //
                 peakBelowHighestPeakValeIndex = i;
-                peakBelowHighestPeakValeVale = mX121Helper.GetVale(i);
+                peakBelowHighestPeakValeVale = mX121Helper.xpvHelper.GetVale(i);
                 break;
             }
         }
@@ -651,8 +663,8 @@ class XC121SMCCycleHelper : public XCBase
             bool isInited = GetBar(iBar, i);
 
             //
-            double iPeak = mX121Helper.GetPeak(i);
-            double iVale = mX121Helper.GetVale(i);
+            double iPeak = mX121Helper.xpvHelper.GetPeak(i);
+            double iVale = mX121Helper.xpvHelper.GetVale(i);
 
             //
             bool hasPeakPriceInsideZone = CalculatePriceInsideZones(

X121SMCEA/Classes/x-121.smc.x-tradehandler.class.mq5

@@ -3279,9 +3279,9 @@ class XC121SMCTradeHandler : public XCBaseAlert
                     conditions,
                     conditionsObjects,
                     mDrawer,
-                    true,
+                    false,
                     true, // Analyse Price Zones ...
-                    true, // Decision Zone ...
+                    false, // Decision Zone ...
                     true  // Only Box ...
                 );
             }