diff --git a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index de47ea65..df6f7f77 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7912,7 +7912,21 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDBullCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) // ) // @@ -7977,7 +7991,22 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) // ) // @@ -8003,7 +8032,66 @@ bool XUSCHF5XCHMACCHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXLHLowAttachedLL && + mConditions.isXRSICrossedUnderShortExit) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest) + // + ) + // + ) + // + ) // ) // @@ -8044,7 +8132,19 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXAMABullish && + mConditions.isXTDBullOverBear) + // + ) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index e5b60659..2d8c3472 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -13,6 +13,6 @@ Resolve XUSCHF5 XTAM Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XSI Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XTSFI Shorts All Stopouts in All Markets ... Resolve XUSCHF5 XOBDLH Shorts All Stopouts in All Markets ... -Resolve XUSCHF5 XCHMACC Shorts All Stopouts in ... +Resolve XUSCHF5 XCHMACC Shorts All Stopouts in GrowthNext ... Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in ... Resolve XUSCHF5 XCHMAMN Shorts All Stopouts in ... diff --git a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index de47ea65..df6f7f77 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7912,7 +7912,21 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDBullCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) // ) // @@ -7977,7 +7991,22 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) // ) // @@ -8003,7 +8032,66 @@ bool XUSCHF5XCHMACCHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXLHLowAttachedLL && + mConditions.isXRSICrossedUnderShortExit) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest) + // + ) + // + ) + // + ) // ) // @@ -8044,7 +8132,19 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXAMABullish && + mConditions.isXTDBullOverBear) + // + ) + // + ) + // + ) // ) // diff --git a/Projects/XUSCHF5/Settings/XCHMACC.set b/Projects/XUSCHF5/Settings/XCHMACC.set index 4f0336e6..097d6e93 100644 Binary files a/Projects/XUSCHF5/Settings/XCHMACC.set and b/Projects/XUSCHF5/Settings/XCHMACC.set differ diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index de47ea65..df6f7f77 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7912,7 +7912,21 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDBullCrossedUnderBear && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) // ) // @@ -7977,7 +7991,22 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + ) + // + ) + // + ) // ) // @@ -8003,7 +8032,66 @@ bool XUSCHF5XCHMACCHasShortSignal() !mConditions.isXLHLLSameInLength) && // ( - false) + // + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + (mConditions.isXCHLHSameLLs && + mConditions.isXLHLowAttachedLL && + mConditions.isXRSICrossedUnderShortExit) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMASCUnderMin && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + (mConditions.isXTMBearish && + mConditions.isXAMABearish && + mConditions.isXTSCurrentMin && + mConditions.isXLHLowAttachedLL && + mConditions.isXTDBullUnderBear && + mConditions.isXTDSignalUnderBear && + mConditions.isXTSCurrentUnderFarest) + // + ) + // + ) + // + ) // ) // @@ -8044,7 +8132,19 @@ bool XUSCHF5XCHMACCHasShortSignal() mConditions.isXLHHHSameInLength) && // ( - false) + // + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXAMABullish && + mConditions.isXTDBullOverBear) + // + ) + // + ) + // + ) // ) //