last ...

XCATBEA/Libraries/xcatbea.lib.mq5

@@ -204,7 +204,6 @@ struct XTriggerBlockFilters
     bool filterBasedOnDelta;       // Filter Based On Delta ...
     bool filterBasedOnVolume;      // Filter Based On Volume ...
     bool filterBasedOnSignalBar;   // Filter Based on Signal Bar ...
-    bool filterBasedOnRoundPrice;  // Filter Based On Round Prices ...
     bool filterBasedOnHKSignalBar; // Filter Based On HK Signal Bar ...
 
     //
@@ -263,7 +262,6 @@ struct XTriggerBlockFilters
         filterBasedOnDelta = false;
         filterBasedOnVolume = false;
         filterBasedOnSignalBar = false;
-        filterBasedOnRoundPrice = false;
         filterBasedOnHKSignalBar = false;
 
         //
@@ -1361,34 +1359,52 @@ bool FilterTriggerBlock(
             iPFSarState >= 0;
 
         //
-        // Creating Filters ...
+        // Check SAR Direction ...
 
         //
-        bool isToFilterPassed =
-            !filters.forceSarSwitched
-                ? (isBullish
-                       ? isSarBullish
-                       : isSarBearish)
-                : (isBullish
-                       ? isSarSwitchedToBullish
-                       : isSarSwitchedToBearish);
+        if (result &&
+            !filters.forceSarSwitched)
+        {
+            //
+            result = isBullish
+                         ? isSarBullish
+                         : isSarBearish;
+        }
 
         //
-        bool isFromFilterPassed =
-            !filters.forceSarSwitched
-                ? (isBullish
-                       ? isFSarBullish
-                       : isFSarBearish)
-                : (isBullish
-                       ? isFSarSwitchedToBullish
-                       : isFSarSwitchedToBearish);
+        if (result &&
+            filters.forceSarSwitched)
+        {
+            //
+            result = isBullish
+                         ? isSarSwitchedToBullish
+                         : isSarSwitchedToBearish;
+        }
 
         //
-        result =
-            !filters.forceSarOnBothSide
-                ? isToFilterPassed
-                : isToFilterPassed &&
-                      isFromFilterPassed;
+        if (result &&
+            filters.forceSarOnBothSide)
+        {
+            //
+            if (result &&
+                !filters.forceSarSwitched)
+            {
+                //
+                result = isBullish
+                             ? isFSarBullish
+                             : isFSarBearish;
+            }
+
+            //
+            if (result &&
+                filters.forceSarSwitched)
+            {
+                //
+                result = isBullish
+                             ? isFSarSwitchedToBullish
+                             : isFSarSwitchedToBearish;
+            }
+        }
 
         //
         // Check Sar Has Reversal Direction inside Trigger Block ...
@@ -2262,15 +2278,6 @@ bool FilterTriggerBlock(
         }
     }
 
-    //
-    // Filter Based Round Price ...
-    if (result &&
-        filters.filterBasedOnRoundPrice)
-    {
-        //
-        // TODO: Implement this ...
-    }
-
     //
     if (!result)
     {