last ...

2025-01-21 05:46:01 +03:30
parent 6363320cc2
commit 560a54af30
16 changed files with 7623 additions and 859 deletions
@@ -423,25 +423,63 @@ bool DetectX121SMCXSTRPVSiganlSetup(

    //
    // Consolidation ...
-
-    //
-    bool hasConsolidationBullishTrend = consolidationXConditions.isTrendBullish;
-    bool hasConsolidationBearishTrend = consolidationXConditions.isTrendBearish;
+    ENUM_X_DIRECTION consolidationTrendDir;
+    bool hasConsolidationTrend =
+        consolidationCycleHelper
+            .DetectMarketStructure(
+                consolidationTrendDir //
+            );
+    bool hasConsolidationBullishTrend =
+        hasConsolidationTrend &&
+        IsBullish(consolidationTrendDir);
+    bool hasConsolidationBearishTrend =
+        hasConsolidationTrend &&
+        IsBearish(consolidationTrendDir);

    //
    // Verification ...
-    bool hasVerificationBullishTrend = verificationXConditions.isTrendBullish;
-    bool hasVerificationBearishTrend = verificationXConditions.isTrendBearish;
+    ENUM_X_DIRECTION verificationTrendDir;
+    bool hasVerificationTrend =
+        verificationCycleHelper
+            .DetectMarketStructure(
+                verificationTrendDir //
+            );
+    bool hasVerificationBullishTrend =
+        hasVerificationTrend &&
+        IsBullish(verificationTrendDir);
+    bool hasVerificationBearishTrend =
+        hasVerificationTrend &&
+        IsBearish(verificationTrendDir);

    //
    // Analyse ...
-    bool hasAnalyseBullishTrend = analyseXConditions.isTrendBullish;
-    bool hasAnalyseBearishTrend = analyseXConditions.isTrendBearish;
+    ENUM_X_DIRECTION analyseTrendDir;
+    bool hasAnalyseTrend =
+        analyseCycleHelper
+            .DetectMarketStructure(
+                analyseTrendDir //
+            );
+    bool hasAnalyseBullishTrend =
+        hasAnalyseTrend &&
+        IsBullish(analyseTrendDir);
+    bool hasAnalyseBearishTrend =
+        hasAnalyseTrend &&
+        IsBearish(analyseTrendDir);

    //
    // Decision ...
-    bool hasDecisionBullishTrend = decisionXConditions.isTrendBullish;
-    bool hasDecisionBearishTrend = decisionXConditions.isTrendBearish;
+    ENUM_X_DIRECTION decisionTrendDir;
+    bool hasDecisionTrend =
+        decisionCycleHelper
+            .DetectMarketStructure(
+                decisionTrendDir //
+            );
+    bool hasDecisionBullishTrend =
+        hasDecisionTrend &&
+        IsBullish(decisionTrendDir);
+    bool hasDecisionBearishTrend =
+        hasDecisionTrend &&
+        IsBearish(decisionTrendDir);
   
    //
    // Detect Bar State ...