diff --git a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index b5f6ac0c..e9854fe0 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -39406,19 +39406,6 @@ bool XUSPY5XCHMACCHasLongSignal() // || // - (mConditions.isXTDSignalOverBear && - ( - // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHLHMCLCHHSame) - // - ) - // - ) - // - || - // ((mConditions.isXAMANeutural && mConditions.isXLHLLDecreased && mConditions.isXCHMASCOverMin && @@ -39437,6 +39424,21 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentCrossedOverFarest) + // + ) + // + ) + // ) // ) @@ -39482,8 +39484,19 @@ bool XUSPY5XCHMACCHasLongSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHLHMCLCHHSame) + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + || + // + (mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentUnderFarest) + // + ) + // + ) // ) // @@ -39815,7 +39828,24 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTDBullUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXLHLLDecreased && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // + ) + // + ) // ) // @@ -39992,14 +40022,33 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDBullUnderBear && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + (mConditions.isXAMANeutural && + ( + // + mConditions.isXTMNeutural + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased && + mConditions.isXTMStartBullish) + // + ) + // + ) // || // (mConditions.isXFIUnderZero && mConditions.isXFICrossedUnderZero) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH) + // ) // ) @@ -40281,10 +40330,24 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXLHLLIncreased && - mConditions.isXCHMASCOverMax) + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax) && + ( + // + (mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMax) + // + || + // + (mConditions.isXCHLHSameHHs && + mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish && + mConditions.isXLHHighAttachedHH && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) // ) // @@ -40446,6 +40509,13 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXCHLHSCMCLLSame && mConditions.isXCHMASCCrossedOverMax) // + || + // + (mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest) + // ) // ) diff --git a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index b5f6ac0c..e9854fe0 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -39406,19 +39406,6 @@ bool XUSPY5XCHMACCHasLongSignal() // || // - (mConditions.isXTDSignalOverBear && - ( - // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHLHMCLCHHSame) - // - ) - // - ) - // - || - // ((mConditions.isXAMANeutural && mConditions.isXLHLLDecreased && mConditions.isXCHMASCOverMin && @@ -39437,6 +39424,21 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentCrossedOverFarest) + // + ) + // + ) + // ) // ) @@ -39482,8 +39484,19 @@ bool XUSPY5XCHMACCHasLongSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHLHMCLCHHSame) + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + || + // + (mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentUnderFarest) + // + ) + // + ) // ) // @@ -39815,7 +39828,24 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTDBullUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXLHLLDecreased && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // + ) + // + ) // ) // @@ -39992,14 +40022,33 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDBullUnderBear && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + (mConditions.isXAMANeutural && + ( + // + mConditions.isXTMNeutural + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased && + mConditions.isXTMStartBullish) + // + ) + // + ) // || // (mConditions.isXFIUnderZero && mConditions.isXFICrossedUnderZero) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH) + // ) // ) @@ -40281,10 +40330,24 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXLHLLIncreased && - mConditions.isXCHMASCOverMax) + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax) && + ( + // + (mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMax) + // + || + // + (mConditions.isXCHLHSameHHs && + mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish && + mConditions.isXLHHighAttachedHH && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) // ) // @@ -40446,6 +40509,13 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXCHLHSCMCLLSame && mConditions.isXCHMASCCrossedOverMax) // + || + // + (mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest) + // ) // ) diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index b5f6ac0c..e9854fe0 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -39406,19 +39406,6 @@ bool XUSPY5XCHMACCHasLongSignal() // || // - (mConditions.isXTDSignalOverBear && - ( - // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHLHMCLCHHSame) - // - ) - // - ) - // - || - // ((mConditions.isXAMANeutural && mConditions.isXLHLLDecreased && mConditions.isXCHMASCOverMin && @@ -39437,6 +39424,21 @@ bool XUSPY5XCHMACCHasLongSignal() // ) // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentCrossedOverFarest) + // + ) + // + ) + // ) // ) @@ -39482,8 +39484,19 @@ bool XUSPY5XCHMACCHasLongSignal() ( // (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHLHMCLCHHSame) + ( + // + (mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame) + // + || + // + (mConditions.isXTSCurrentOverMediest && + mConditions.isXTSCurrentUnderFarest) + // + ) + // + ) // ) // @@ -39815,7 +39828,24 @@ bool XUSPY5XCHMACCHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXTDSignalUnderBear && + ( + // + (mConditions.isXTDBullUnderBear && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXLHLLDecreased && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) + // + ) + // + ) // ) // @@ -39992,14 +40022,33 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDBullUnderBear && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + (mConditions.isXAMANeutural && + ( + // + mConditions.isXTMNeutural + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXLHHHDecreased && + mConditions.isXTMStartBullish) + // + ) + // + ) // || // (mConditions.isXFIUnderZero && mConditions.isXFICrossedUnderZero) // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXLHHighAttachedHH) + // ) // ) @@ -40281,10 +40330,24 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXTDSignalUnderBear && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXLHLLIncreased && - mConditions.isXCHMASCOverMax) + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax) && + ( + // + (mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMax) + // + || + // + (mConditions.isXCHLHSameHHs && + mConditions.isXTMStartBullish && + mConditions.isXAMAStartBullish && + mConditions.isXLHHighAttachedHH && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) // ) // @@ -40446,6 +40509,13 @@ bool XUSPY5XCHMACCHasLongSignal() (mConditions.isXCHLHSCMCLLSame && mConditions.isXCHMASCCrossedOverMax) // + || + // + (mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverNearest && + mConditions.isXTSCurrentOverMediest) + // ) // )