last ...

X121XKIEA/Classes/x-saherelm.x121.xki.parser.class.mq5

@@ -274,7 +274,6 @@ class XCX121XKIHelperParser : XCBase
         //
         return result;
     }
-
     // #endregion
 
     // #region KI Slow ...
@@ -875,10 +874,7 @@ class XCX121XKIHelperParser : XCBase
         return result;
     }
 
-    bool IsVolatilityHigh(
-        int barIndex = 0,
-        double threshold = 20 //
-    )
+    bool IsVolatilityHigh(int barIndex = 0)
     {
         //
         bool result = false;
@@ -894,16 +890,17 @@ class XCX121XKIHelperParser : XCBase
         {
             return result;
         }
-
+                
+        //
+        double atr = helper.GetATR(barIndex); 
+        double atrMa = helper.GetATRSmoothed(barIndex); 
+        result = atr > atrMa;
+        
         //
-        result = helper.GetATR(barIndex) > threshold;
         return result;
     }
 
-    bool IsVolatilityLow(
-        int barIndex = 0,
-        double threshold = 20 //
-    )
+    bool IsVolatilityLow(int barIndex = 0)
     {
         //
         bool result = false;
@@ -921,7 +918,11 @@ class XCX121XKIHelperParser : XCBase
         }
 
         //
-        result = helper.GetATR(barIndex) < threshold;
+        double atr = helper.GetATR(barIndex); 
+        double atrMa = helper.GetATRSmoothed(barIndex); 
+        result = atr < atrMa;
+
+        //
         return result;
     }
     // #endregion
@@ -1157,7 +1158,7 @@ class XCX121XKIHelperParser : XCBase
 
         //
         result = IsTrendBearish(barIndex) &&
-                IsRSIBearish(barIndex);
+                 IsRSIBearish(barIndex);
 
         //
         return result;
@@ -1184,7 +1185,7 @@ class XCX121XKIHelperParser : XCBase
         result =
             IsPriceAboveKIUpper(barIndex) &&
             IsATRBreakoutUp(barIndex) &&
-            IsVolatilityHigh(barIndex, 20);
+            IsVolatilityHigh(barIndex);
 
         //
         return result;
@@ -1211,7 +1212,7 @@ class XCX121XKIHelperParser : XCBase
         result =
             IsPriceBelowKILower(barIndex) &&
             IsATRBreakoutDown(barIndex) &&
-            IsVolatilityHigh(barIndex, 20);
+            IsVolatilityHigh(barIndex);
         return result;
     }
 
@@ -1331,7 +1332,7 @@ class XCX121XKIHelperParser : XCBase
                  IsKISlowBullish(barIndex) &&
                  IsMACrossoverBullish(barIndex) &&
                  (helper.GetRSI(barIndex) > 60) &&
-                 IsVolatilityHigh(barIndex, 20);
+                 IsVolatilityHigh(barIndex);
 
         //
         return result;
@@ -1365,7 +1366,7 @@ class XCX121XKIHelperParser : XCBase
                  IsKISlowBearish(barIndex) &&
                  IsMACrossoverBearish(barIndex) &&
                  (helper.GetRSI(barIndex) < 40) &&
-                 IsVolatilityHigh(barIndex, 20);
+                 IsVolatilityHigh(barIndex);
 
         //
         return result;