last ...

2025-01-21 05:46:01 +03:30
parent 6363320cc2
commit 560a54af30
16 changed files with 7623 additions and 859 deletions
@@ -309,18 +309,48 @@ bool DetectX121SMCGuards(

    //
    // Trigger ...
-    bool hasTriggerBullishTrend = triggerXConditions.bullishTrendBuffer[1];
-    bool hasTriggerBearishTrend = triggerXConditions.bearishTrendBuffer[1];
+    ENUM_X_DIRECTION triggerTrendDir;
+    bool hasTriggerTrend =
+        triggerCycleHelper
+            .DetectMarketStructure(
+                triggerTrendDir //
+            );
+    bool hasTriggerBullishTrend =
+        hasTriggerTrend &&
+        IsBullish(triggerTrendDir);
+    bool hasTriggerBearishTrend =
+        hasTriggerTrend &&
+        IsBearish(triggerTrendDir);

    //
    // Decision ...
-    bool hasDecisionBullishTrend = decisionXConditions.bullishTrendBuffer[1];
-    bool hasDecisionBearishTrend = decisionXConditions.bearishTrendBuffer[1];
+    ENUM_X_DIRECTION decisionTrendDir;
+    bool hasDecisionTrend =
+        decisionCycleHelper
+            .DetectMarketStructure(
+                decisionTrendDir //
+            );
+    bool hasDecisionBullishTrend =
+        hasDecisionTrend &&
+        IsBullish(decisionTrendDir);
+    bool hasDecisionBearishTrend =
+        hasDecisionTrend &&
+        IsBearish(decisionTrendDir);

    //
    // Analyse ...
-    bool hasAnalyseBullishTrend = analyseXConditions.bullishTrendBuffer[1];
-    bool hasAnalyseBearishTrend = analyseXConditions.bearishTrendBuffer[1];
+    ENUM_X_DIRECTION analyseTrendDir;
+    bool hasAnalyseTrend =
+        analyseCycleHelper
+            .DetectMarketStructure(
+                analyseTrendDir //
+            );
+    bool hasAnalyseBullishTrend =
+        hasAnalyseTrend &&
+        IsBullish(analyseTrendDir);
+    bool hasAnalyseBearishTrend =
+        hasAnalyseTrend &&
+        IsBearish(analyseTrendDir);

    //
    // Consolidation Zone ...