diff --git a/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 index b0c089d1..4952ea4f 100644 --- a/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 @@ -2038,13 +2038,20 @@ bool XGPUS5XTDHasLongSignal() // ((mConditions.isXCHMAMCVale && mConditions.isXTSCurrentMax && - mConditions.isXCHLHMCLCHHSame && mConditions.isXCHMASCUnderMin && mConditions.isXTDSignalCrossedOverBear) && ( // - (mConditions.isXTMBullish && - mConditions.isXAMANeutural) + ((mConditions.isXCHLHMCLCHHSame || + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMANeutural) + // + ) + // + ) // ) // @@ -2242,10 +2249,28 @@ bool XGPUS5XTDHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXCHLHSCMCHHSame + // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXTSCurrentCrossedUnderMediest && + mConditions.isXTSCurrentCrossedUnderFarest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2566,18 +2591,56 @@ bool XGPUS5XTDHasLongSignal() ( // ((mConditions.isXCHMAMCVale && - mConditions.isXTSCurrentMax && mConditions.isXTDBearishVale && mConditions.isXCHMASCUnderMin) && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + (mConditions.isXTSCurrentMax && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) // || // - (mConditions.isXTMEndBullish && - mConditions.isXAMAEndBullish) + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHLHMCLCLLSame && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2978,6 +3041,20 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHLHSCMCHHSame && mConditions.isXLHHighAttachedHH) // + || + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTMStartBullish && + mConditions.isXCHMASCCrossedOverMax) + // + ) + // + ) + // ) // ) @@ -3094,6 +3171,18 @@ bool XGPUS5XTDHasLongSignal() ((mConditions.isXCHMALCPeak && mConditions.isXCHMASCOverMax) && ( + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || // ((mConditions.isXCHLHMCLCLLSame && (mConditions.isXCHLHSCMCHHSame || @@ -3586,6 +3675,22 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXLHLLIncreased && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) diff --git a/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 b/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 index b0c089d1..4952ea4f 100644 --- a/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 +++ b/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 @@ -2038,13 +2038,20 @@ bool XGPUS5XTDHasLongSignal() // ((mConditions.isXCHMAMCVale && mConditions.isXTSCurrentMax && - mConditions.isXCHLHMCLCHHSame && mConditions.isXCHMASCUnderMin && mConditions.isXTDSignalCrossedOverBear) && ( // - (mConditions.isXTMBullish && - mConditions.isXAMANeutural) + ((mConditions.isXCHLHMCLCHHSame || + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMANeutural) + // + ) + // + ) // ) // @@ -2242,10 +2249,28 @@ bool XGPUS5XTDHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXCHLHSCMCHHSame + // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXTSCurrentCrossedUnderMediest && + mConditions.isXTSCurrentCrossedUnderFarest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2566,18 +2591,56 @@ bool XGPUS5XTDHasLongSignal() ( // ((mConditions.isXCHMAMCVale && - mConditions.isXTSCurrentMax && mConditions.isXTDBearishVale && mConditions.isXCHMASCUnderMin) && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + (mConditions.isXTSCurrentMax && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) // || // - (mConditions.isXTMEndBullish && - mConditions.isXAMAEndBullish) + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHLHMCLCLLSame && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2978,6 +3041,20 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHLHSCMCHHSame && mConditions.isXLHHighAttachedHH) // + || + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTMStartBullish && + mConditions.isXCHMASCCrossedOverMax) + // + ) + // + ) + // ) // ) @@ -3094,6 +3171,18 @@ bool XGPUS5XTDHasLongSignal() ((mConditions.isXCHMALCPeak && mConditions.isXCHMASCOverMax) && ( + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || // ((mConditions.isXCHLHMCLCLLSame && (mConditions.isXCHLHSCMCHHSame || @@ -3586,6 +3675,22 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXLHLLIncreased && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 index b0c089d1..4952ea4f 100644 --- a/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 @@ -2038,13 +2038,20 @@ bool XGPUS5XTDHasLongSignal() // ((mConditions.isXCHMAMCVale && mConditions.isXTSCurrentMax && - mConditions.isXCHLHMCLCHHSame && mConditions.isXCHMASCUnderMin && mConditions.isXTDSignalCrossedOverBear) && ( // - (mConditions.isXTMBullish && - mConditions.isXAMANeutural) + ((mConditions.isXCHLHMCLCHHSame || + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMANeutural) + // + ) + // + ) // ) // @@ -2242,10 +2249,28 @@ bool XGPUS5XTDHasLongSignal() (mConditions.isXTSCurrentUnderMediest && ( // - (mConditions.isXCHMAMCPeak && - mConditions.isXCHMALCVale && - mConditions.isXCHLHSCMCHHSame && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXCHLHSCMCHHSame + // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXTSCurrentCrossedUnderMediest && + mConditions.isXTSCurrentCrossedUnderFarest) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2566,18 +2591,56 @@ bool XGPUS5XTDHasLongSignal() ( // ((mConditions.isXCHMAMCVale && - mConditions.isXTSCurrentMax && mConditions.isXTDBearishVale && mConditions.isXCHMASCUnderMin) && ( // - (mConditions.isXTMNeutural && - mConditions.isXAMANeutural) + (mConditions.isXTSCurrentMax && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) // || // - (mConditions.isXTMEndBullish && - mConditions.isXAMAEndBullish) + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHLHMCLCLLSame && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2978,6 +3041,20 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHLHSCMCHHSame && mConditions.isXLHHighAttachedHH) // + || + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHLHMCLCLLSame) && + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTMStartBullish && + mConditions.isXCHMASCCrossedOverMax) + // + ) + // + ) + // ) // ) @@ -3094,6 +3171,18 @@ bool XGPUS5XTDHasLongSignal() ((mConditions.isXCHMALCPeak && mConditions.isXCHMASCOverMax) && ( + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || // ((mConditions.isXCHLHMCLCLLSame && (mConditions.isXCHLHSCMCHHSame || @@ -3586,6 +3675,22 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXLHLLIncreased && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // )