From ccdd2af1d3b0481b90b016b3c9a26abd364ac554 Mon Sep 17 00:00:00 2001 From: Hadi Khazaee Asl Date: Mon, 19 Feb 2024 05:08:57 -0800 Subject: [PATCH] Resolve XUSCHF5 XOBDLH Shorts All Stopouts in OANDA, MetaQuotes, HFMarkets ... --- ...herelm.xuschf5.provider.indicators.lib.mq5 | 26 ++++++++++++++----- Documents/Templates/Brokers List.txt | 2 +- ...herelm.xuschf5.provider.indicators.lib.mq5 | 26 ++++++++++++++----- ...herelm.xuschf5.provider.indicators.lib.mq5 | 26 ++++++++++++++----- 4 files changed, 58 insertions(+), 22 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 a912a472..bbbf9ebc 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7224,13 +7224,25 @@ bool XUSCHF5XOBDLHHasShortSignal() mConditions.isXAMABullish) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCOverMax && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHMALCTrendsUp && - mConditions.isXTDSignalOverBear) + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMALCTrendsUp) + // + ) + // + ) // ) // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 8b1f6175..63a786ab 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -12,7 +12,7 @@ Resolve XUSCHF5 XTD Shorts All Stopouts in All Markets ... 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 OANDA ... +Resolve XUSCHF5 XOBDLH Shorts All Stopouts in AMarkets-Demo ... Resolve XUSCHF5 XCHMACC Shorts All Stopouts in ... 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 a912a472..bbbf9ebc 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7224,13 +7224,25 @@ bool XUSCHF5XOBDLHHasShortSignal() mConditions.isXAMABullish) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCOverMax && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHMALCTrendsUp && - mConditions.isXTDSignalOverBear) + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMALCTrendsUp) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index a912a472..bbbf9ebc 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -7224,13 +7224,25 @@ bool XUSCHF5XOBDLHHasShortSignal() mConditions.isXAMABullish) && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXCHMASCOverMax && - mConditions.isXTDBullOverBear && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXCHMALCTrendsUp && - mConditions.isXTDSignalOverBear) + ((mConditions.isXTDBullOverBear && + mConditions.isXTDSignalOverBear) && + ( + // + (mConditions.isXCHMASCPeak && + mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCPeak) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMALCTrendsUp) + // + ) + // + ) // ) //