diff --git a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 index 45cbb607..756ca79b 100644 --- a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -9378,7 +9378,12 @@ bool XAU5XCHMACCHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + (mConditions.isXTDBullOverBear && + (mConditions.isXTSCurrentOverNearest || + mConditions.isXTSCurrentCrossedOverNearest)) + // + ) // ) // @@ -9422,6 +9427,15 @@ bool XAU5XCHMACCHasShortSignal() ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastUnderSlow) && ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // + || // (mConditions.isXCHMASCUnderMin && ( @@ -9438,11 +9452,29 @@ bool XAU5XCHMACCHasShortSignal() mConditions.isXTSCurrentCrossedOverNearest) && ( // - mConditions.isXTMBearish && - mConditions.isXAMABearish && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentOverFarest + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((mConditions.isXCHLHMCLCHHSame) && + ( + // + (mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverFarest) + // + || + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXFICrossedOverZero) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 index 45cbb607..756ca79b 100644 --- a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -9378,7 +9378,12 @@ bool XAU5XCHMACCHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + (mConditions.isXTDBullOverBear && + (mConditions.isXTSCurrentOverNearest || + mConditions.isXTSCurrentCrossedOverNearest)) + // + ) // ) // @@ -9422,6 +9427,15 @@ bool XAU5XCHMACCHasShortSignal() ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastUnderSlow) && ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // + || // (mConditions.isXCHMASCUnderMin && ( @@ -9438,11 +9452,29 @@ bool XAU5XCHMACCHasShortSignal() mConditions.isXTSCurrentCrossedOverNearest) && ( // - mConditions.isXTMBearish && - mConditions.isXAMABearish && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentOverFarest + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((mConditions.isXCHLHMCLCHHSame) && + ( + // + (mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverFarest) + // + || + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXFICrossedOverZero) + // + ) + // + ) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 index 45cbb607..756ca79b 100644 --- a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 @@ -9378,7 +9378,12 @@ bool XAU5XCHMACCHasShortSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + (mConditions.isXTDBullOverBear && + (mConditions.isXTSCurrentOverNearest || + mConditions.isXTSCurrentCrossedOverNearest)) + // + ) // ) // @@ -9422,6 +9427,15 @@ bool XAU5XCHMACCHasShortSignal() ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastUnderSlow) && ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXLHPriceCrossedUnderSignal) + // + || // (mConditions.isXCHMASCUnderMin && ( @@ -9438,11 +9452,29 @@ bool XAU5XCHMACCHasShortSignal() mConditions.isXTSCurrentCrossedOverNearest) && ( // - mConditions.isXTMBearish && - mConditions.isXAMABearish && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTDSignalUnderBear && - mConditions.isXTSCurrentOverFarest + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((mConditions.isXCHLHMCLCHHSame) && + ( + // + (mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentOverFarest) + // + || + // + (mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXFICrossedOverZero) + // + ) + // + ) + // + ) + // + ) // ) //