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 bb8a85ab..082907d4 100644 --- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1882,6 +1882,22 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // ) // ) @@ -2005,10 +2021,22 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentUnderMediest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXTSCurrentUnderMediest + // + || + // + (mConditions.isXTSCurrentMax && + (mConditions.isXAMANeutural || + mConditions.isXAMAEndBullish)) + // + ) + // + ) // || // @@ -2066,6 +2094,14 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + || + // (mConditions.isXCHLHMCLCHHSame && ( // @@ -2106,6 +2142,20 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXLHPriceCrossedOverSignal) + // + || + // + ((mConditions.isXTSCurrentUnderNearest || + mConditions.isXTSCurrentCrossedUnderNearest) && + (mConditions.isXTSCurrentUnderMediest || + mConditions.isXTSCurrentCrossedUnderMediest)) + // ) // ) 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 bb8a85ab..082907d4 100644 --- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -1882,6 +1882,22 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow && + mConditions.isXTSCurrentUnderMediest) + // + ) + // + ) + // ) // ) @@ -2005,10 +2021,22 @@ bool XUSCHF5XTDHasLongSignal() // || // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentUnderMediest && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXTSCurrentUnderMediest + // + || + // + (mConditions.isXTSCurrentMax && + (mConditions.isXAMANeutural || + mConditions.isXAMAEndBullish)) + // + ) + // + ) // || // @@ -2066,6 +2094,14 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXCHMALCTrendsDown && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest) + // + || + // (mConditions.isXCHLHMCLCHHSame && ( // @@ -2106,6 +2142,20 @@ bool XUSCHF5XTDHasLongSignal() // ) // + || + // + (mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXLHPriceCrossedOverSignal) + // + || + // + ((mConditions.isXTSCurrentUnderNearest || + mConditions.isXTSCurrentCrossedUnderNearest) && + (mConditions.isXTSCurrentUnderMediest || + mConditions.isXTSCurrentCrossedUnderMediest)) + // ) // ) diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 index 7d25f5b6..082907d4 100644 --- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 @@ -2144,6 +2144,13 @@ bool XUSCHF5XTDHasLongSignal() // || // + (mConditions.isXTSCurrentMax && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTSCurrentOverMediest && + mConditions.isXLHPriceCrossedOverSignal) + // + || + // ((mConditions.isXTSCurrentUnderNearest || mConditions.isXTSCurrentCrossedUnderNearest) && (mConditions.isXTSCurrentUnderMediest ||