From 4add25ec9e89d692800dd7bb86974a9eec089a5e Mon Sep 17 00:00:00 2001 From: Hadi Khazaee Asl Date: Mon, 19 Feb 2024 12:52:15 -0800 Subject: [PATCH] Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in GrowthNext, OANDA ... --- ...herelm.xuschf5.provider.indicators.lib.mq5 | 19 +++++++++++++++---- Documents/Templates/Brokers List.txt | 2 +- ...herelm.xuschf5.provider.indicators.lib.mq5 | 19 +++++++++++++++---- ...herelm.xuschf5.provider.indicators.lib.mq5 | 19 +++++++++++++++---- 4 files changed, 46 insertions(+), 13 deletions(-) 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 8d9bd455..5edc95b8 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -9803,10 +9803,21 @@ bool XUSCHF5XCHMAMXHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin && - mConditions.isXCHMALCFastOverSlow && - mConditions.isXTSCurrentCrossedUnderNearest) + (mConditions.isXCHMALCFastOverSlow && + ( + // + (mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMASCFastOverSlow) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 4621f225..51973693 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -16,5 +16,5 @@ 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 All Markets ... -Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in GrowthNext ... +Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in MetaQuotes ... 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 8d9bd455..5edc95b8 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -9803,10 +9803,21 @@ bool XUSCHF5XCHMAMXHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin && - mConditions.isXCHMALCFastOverSlow && - mConditions.isXTSCurrentCrossedUnderNearest) + (mConditions.isXCHMALCFastOverSlow && + ( + // + (mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMASCFastOverSlow) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 8d9bd455..5edc95b8 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -9803,10 +9803,21 @@ bool XUSCHF5XCHMAMXHasShortSignal() mConditions.isXAMABearish) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin && - mConditions.isXCHMALCFastOverSlow && - mConditions.isXTSCurrentCrossedUnderNearest) + (mConditions.isXCHMALCFastOverSlow && + ( + // + (mConditions.isXCHMALCTrendsUp && + mConditions.isXCHMASCFastOverSlow) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) // ) //