last ...

XCAEA/Libraries/xcaea.signaller.lib.mq5

@@ -81,7 +81,7 @@ struct XCAEAStrategyConditions
 
     //
     double partialCloseOnTPLevel;
-    double partialCloseMultiplier;    
+    double partialCloseMultiplier;
 
     //
     ENUM_X_DIRECTION dir;
@@ -124,7 +124,7 @@ struct XCAEAStrategyConditions
 
         //
         partialCloseOnTPLevel = 0;
-        partialCloseMultiplier = 0;        
+        partialCloseMultiplier = 0;
 
         //
         Clean(targets);
@@ -578,6 +578,24 @@ bool DetectDecisionZone(
     //
     bool isVolumeNeutural = MathAbs(bullishVolume - bearishVolume) == 0;
 
+    //
+    // Checking OB ...
+    XBoxZone ob;
+    bool isOB = helper
+                    .barAnalyser
+                    .IsOrderBlock(
+                        cBar,
+                        ob,
+                        false, // Force FVG Bar Type
+                        true   // Force Two Bar Start ...
+                    );
+    bool isBullishOB =
+        isOB &&
+        ob.IsBullish();
+    bool isBearishOB =
+        isOB &&
+        ob.IsBearish();
+
     //
     // Reading Values ...
 
@@ -1074,6 +1092,7 @@ bool DetectDecisionZone(
 
     //
     bool isCond1Bullish =
+        isBullishOB &&
         isCIsValePivot &&
         isRSICrossedOverOS &&
         !isFiboSectionChanged &&
@@ -1081,6 +1100,7 @@ bool DetectDecisionZone(
 
     //
     bool isCond1Bearish =
+        isBearishOB &&
         isCIsPeakPivot &&
         isRSICrossedUnderOB &&
         !isFiboSectionChanged &&
@@ -1234,6 +1254,7 @@ bool DetectDecisionZone(
     // Cleaning Up ...
 
     //
+    ob.Clean();
     zBar.Clean();
     cBar.Clean();
     pBar.Clean();

XCAEA/Signals/xcaea.signaller.class.mq5

@@ -121,28 +121,28 @@ class XCXCAEASignaller : XCBase
         inputs.x3maInputs.fastLength = 5;
 
         //
-        inputs.x3maInputs.showFast = true;
-        inputs.x3maInputs.showSlow = true;
-        inputs.x3maInputs.showMedium = true;
+        inputs.x3maInputs.showFast = false;
+        inputs.x3maInputs.showSlow = false;
+        inputs.x3maInputs.showMedium = false;
 
         //
-        inputs.caInputs.showMAH = true;
-        inputs.caInputs.showMAL = true;
-        inputs.caInputs.showMAC = true;
-        inputs.caInputs.showSar = true;
+        inputs.caInputs.showMAH = false;
+        inputs.caInputs.showMAL = false;
+        inputs.caInputs.showMAC = false;
+        inputs.caInputs.showSar = false;
         inputs.caInputs.showSwings = true;
-        inputs.caInputs.showFiboLevel1 = true;
-        inputs.caInputs.showFiboLevel2 = true;
-        inputs.caInputs.showFiboLevel3 = true;
-        inputs.caInputs.showFiboLevel4 = true;
-        inputs.caInputs.showFiboLevel5 = true;
+        inputs.caInputs.showFiboLevel1 = false;
+        inputs.caInputs.showFiboLevel2 = false;
+        inputs.caInputs.showFiboLevel3 = false;
+        inputs.caInputs.showFiboLevel4 = false;
+        inputs.caInputs.showFiboLevel5 = false;
         inputs.caInputs.showPeaksAndVales = true;
 
         //
-        inputs.caInputs.showKI = true;
-        inputs.caInputs.showTKI = true;
-        inputs.caInputs.showVidya = true;
-        inputs.caInputs.showTrend = true;
+        inputs.caInputs.showKI = false;
+        inputs.caInputs.showTKI = false;
+        inputs.caInputs.showVidya = false;
+        inputs.caInputs.showTrend = false;
         inputs.caInputs.showPeakAndValeGolden = false;
         inputs.caInputs.showSupportAndResistance = false;
 
@@ -159,7 +159,7 @@ class XCXCAEASignaller : XCBase
 
         //
         // Oscillators Views ...
-        inputs.showRSI = true;
+        inputs.showRSI = false;
         inputs.showCCI = false;
         inputs.showMFI = false;
         inputs.showRVI = false;
@@ -629,7 +629,7 @@ class XCXCAEASignaller : XCBase
 
         //
         // Checking Trigger Cond 2 ...
-        bool canTriggerCond2 = false; 
+        bool canTriggerCond2 = false;
         // CanTriggerCond2(
         //     helper,
         //     conditions.decisionZone,
@@ -693,7 +693,10 @@ class XCXCAEASignaller : XCBase
             }
 
             //
-            double risk = MathAbs(entry - sl);
+            double spred = GetSpread(conditions.symbol);
+
+            //
+            double risk = MathAbs(entry - sl) + spred;
             double reward = (risk * conditions.reward);
             tp =
                 isBullish
@@ -725,8 +728,8 @@ class XCXCAEASignaller : XCBase
 
             //
             // Handling Partial Close ...
-            conditions.partialCloseOnTPLevel = 1;
-            conditions.partialCloseMultiplier = 0.5;
+            // conditions.partialCloseOnTPLevel = 1;
+            // conditions.partialCloseMultiplier = 0.5;
 
             //
             conditions.sl = sl;