last ...

2025-01-18 12:16:28 +03:30
parent 9cdd5b4c7d
commit e74f64c51e
10 changed files with 2111 additions and 1003 deletions
@@ -412,68 +412,26 @@ bool DetectX121SMCXSTRPVSiganlSetup(

    //
    // Consolidation ...
-    ENUM_X_DIRECTION consolidationMarketDir;
-    bool hasConsolidationMarketDir = consolidationCycleHelper
-                                         .DetectMarketStructure(consolidationMarketDir);

    //
-    bool hasConsolidationBullishTrend =
-        hasConsolidationMarketDir &&
-        IsBullish(consolidationMarketDir);
-
-    //
-    bool hasConsolidationBearishTrend =
-        hasConsolidationMarketDir &&
-        IsBearish(consolidationMarketDir);
+    bool hasConsolidationBullishTrend = consolidationXConditions.isTrendBullish;
+    bool hasConsolidationBearishTrend = consolidationXConditions.isTrendBearish;

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

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

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