diff --git a/X121SMCEA/Signals/x-121.smc.x.signal.lib.mq5 b/X121SMCEA/Signals/x-121.smc.x.signal.lib.mq5 index 16ae57f9..e6e1b40c 100644 --- a/X121SMCEA/Signals/x-121.smc.x.signal.lib.mq5 +++ b/X121SMCEA/Signals/x-121.smc.x.signal.lib.mq5 @@ -1029,9 +1029,6 @@ bool DetectX121SMCXSiganlSetup( // if (isNewPeak || isNewVale) { - // - Print("Pivot ..."); - // XPVPivot pivot; @@ -1440,48 +1437,17 @@ bool DetectX121SMCXSiganlSetup( // // Draw Pivot ... - XCBaseObject *drawnObjects[]; - triggerCycleHelper.mPOIDetector.mDrawer.DrawPivot( - conditions.pivotZone, - drawnObjects, - true, // Draw State ... - false, // State As Box ... - true // Tick Zone ... - ); + // XCBaseObject *drawnObjects[]; + // triggerCycleHelper.mPOIDetector.mDrawer.DrawPivot( + // conditions.pivotZone, + // drawnObjects, + // true, // Draw State ... + // false, // State As Box ... + // true // Tick Zone ... + // ); } } - // - // Sar Conditions ... - - // - bool isSarBullishFormed = - ( - // - ( - // - decisionXConditions.isBreakedUpPrevSar && - (decisionXConditions.isSarBullish || - decisionXConditions.isSarSwitchedToBullish) - // - ) - // - ); - - // - bool isSarBearishFormed = - ( - // - ( - // - decisionXConditions.isBreakedDownPrevSar && - (decisionXConditions.isSarBearish || - decisionXConditions.isSarSwitchedToBearish) - // - ) - // - ); - // // // @@ -1494,7 +1460,10 @@ bool DetectX121SMCXSiganlSetup( // hasPivot && // - isCBarBullishRejected && + (isCBarBullishRejected && + pBar.open > cBar.close && + decisionXConditions.isNewValeUnderLast && + decisionXConditions.valesBuffer[1] > conditions.pivotZone.lower) && // // true @@ -1506,7 +1475,10 @@ bool DetectX121SMCXSiganlSetup( // hasPivot && // - isCBarBearishRejected && + (isCBarBearishRejected && + pBar.open < cBar.close && + decisionXConditions.isNewPeakOverLast && + decisionXConditions.peaksBuffer[1] < conditions.pivotZone.upper) && // // true @@ -1547,8 +1519,8 @@ bool DetectX121SMCXSiganlSetup( // // conditions.Clean(); - isCondition1Bullish = false; - isCondition1Bearish = false; + // isCondition1Bullish = false; + // isCondition1Bearish = false; } // @@ -2259,7 +2231,7 @@ bool DetectX121SMCXSiganlTrigger( // double iAtr = decisionConditions.x121Conditions.atrBuffer[1]; - iAtr *= 2.5; + iAtr *= 1.5; // double slsMin = GetMin(sls);