diff --git a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 65cc3eb3..4e8fd386 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -2485,6 +2485,8 @@ bool XUSPY5XTDHasLongSignal() // ( // + // XTD Long ... + // isXTSCurrentUnderNearest (mConditions.isXTSCurrentUnderNearest && ( // @@ -3373,6 +3375,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXTSCurrentUnderMediest (mConditions.isXTSCurrentUnderMediest && ( // @@ -3599,6 +3603,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXTSCurrentUnderFarest (mConditions.isXTSCurrentUnderFarest && ( // @@ -3629,9 +3635,28 @@ bool XUSPY5XTDHasLongSignal() // || // - (mConditions.isXTMNeutural && - mConditions.isXLHLLDecreased && - mConditions.isXLHLLSameInLength) + (mConditions.isXLHLLSameInLength && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXLHLLDecreased) + // + || + // + (mConditions.isXLHHHSameInLength && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXLHLLDecreased && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) // || // @@ -3878,7 +3903,19 @@ bool XUSPY5XTDHasLongSignal() ( // (mConditions.isXCHMALCVale && - mConditions.isXTDBearishVale) + ( + // + mConditions.isXTDBearishVale + // + || + // + (mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) // || // @@ -3995,6 +4032,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMAMCFastUnderSlow // Check if MC Fast Under Slow ... ((mConditions.isXCHMAMCFastUnderSlow || mConditions.isXCHMAMCFastCrossedUnderSlow) && @@ -4374,6 +4413,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMALCFastUnderSlow // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && @@ -4417,6 +4458,21 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + (mConditions.isXLHPriceInSignalRange && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) @@ -4428,6 +4484,17 @@ bool XUSPY5XTDHasLongSignal() // (mConditions.isXLHPriceOverSignal && ( + // + (mConditions.isXTSAllSame && + mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || // ((mConditions.isXCHMALCVale && mConditions.isXTSCurrentMax) && @@ -4440,6 +4507,13 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXTMNeutural && mConditions.isXAMAStartBullish) // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverMediest) + // ) // ) @@ -4769,6 +4843,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMASCTrendsDown ((mConditions.isXCHMASCTrendsDown && mConditions.isXCHMASCFastOverSlow) && ( @@ -4831,6 +4907,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMAMCTrendsDown ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastOverSlow) && ( @@ -5043,6 +5121,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMALCTrendsDown ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow) && ( @@ -5072,6 +5152,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // All Bullish ... ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( diff --git a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 65cc3eb3..4e8fd386 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -2485,6 +2485,8 @@ bool XUSPY5XTDHasLongSignal() // ( // + // XTD Long ... + // isXTSCurrentUnderNearest (mConditions.isXTSCurrentUnderNearest && ( // @@ -3373,6 +3375,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXTSCurrentUnderMediest (mConditions.isXTSCurrentUnderMediest && ( // @@ -3599,6 +3603,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXTSCurrentUnderFarest (mConditions.isXTSCurrentUnderFarest && ( // @@ -3629,9 +3635,28 @@ bool XUSPY5XTDHasLongSignal() // || // - (mConditions.isXTMNeutural && - mConditions.isXLHLLDecreased && - mConditions.isXLHLLSameInLength) + (mConditions.isXLHLLSameInLength && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXLHLLDecreased) + // + || + // + (mConditions.isXLHHHSameInLength && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXLHLLDecreased && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) // || // @@ -3878,7 +3903,19 @@ bool XUSPY5XTDHasLongSignal() ( // (mConditions.isXCHMALCVale && - mConditions.isXTDBearishVale) + ( + // + mConditions.isXTDBearishVale + // + || + // + (mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) // || // @@ -3995,6 +4032,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMAMCFastUnderSlow // Check if MC Fast Under Slow ... ((mConditions.isXCHMAMCFastUnderSlow || mConditions.isXCHMAMCFastCrossedUnderSlow) && @@ -4374,6 +4413,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMALCFastUnderSlow // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && @@ -4417,6 +4458,21 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + (mConditions.isXLHPriceInSignalRange && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) @@ -4428,6 +4484,17 @@ bool XUSPY5XTDHasLongSignal() // (mConditions.isXLHPriceOverSignal && ( + // + (mConditions.isXTSAllSame && + mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || // ((mConditions.isXCHMALCVale && mConditions.isXTSCurrentMax) && @@ -4440,6 +4507,13 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXTMNeutural && mConditions.isXAMAStartBullish) // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverMediest) + // ) // ) @@ -4769,6 +4843,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMASCTrendsDown ((mConditions.isXCHMASCTrendsDown && mConditions.isXCHMASCFastOverSlow) && ( @@ -4831,6 +4907,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMAMCTrendsDown ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastOverSlow) && ( @@ -5043,6 +5121,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMALCTrendsDown ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow) && ( @@ -5072,6 +5152,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // All Bullish ... ((mConditions.isXTMBullish && mConditions.isXAMABullish) && ( diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 65cc3eb3..4e8fd386 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -2485,6 +2485,8 @@ bool XUSPY5XTDHasLongSignal() // ( // + // XTD Long ... + // isXTSCurrentUnderNearest (mConditions.isXTSCurrentUnderNearest && ( // @@ -3373,6 +3375,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXTSCurrentUnderMediest (mConditions.isXTSCurrentUnderMediest && ( // @@ -3599,6 +3603,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXTSCurrentUnderFarest (mConditions.isXTSCurrentUnderFarest && ( // @@ -3629,9 +3635,28 @@ bool XUSPY5XTDHasLongSignal() // || // - (mConditions.isXTMNeutural && - mConditions.isXLHLLDecreased && - mConditions.isXLHLLSameInLength) + (mConditions.isXLHLLSameInLength && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXLHLLDecreased) + // + || + // + (mConditions.isXLHHHSameInLength && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXLHLLDecreased && + mConditions.isXCHLHMCLCLLSame) + // + ) + // + ) + // + ) + // + ) // || // @@ -3878,7 +3903,19 @@ bool XUSPY5XTDHasLongSignal() ( // (mConditions.isXCHMALCVale && - mConditions.isXTDBearishVale) + ( + // + mConditions.isXTDBearishVale + // + || + // + (mConditions.isXTDBullOverBear && + mConditions.isXTSCurrentOverMediest && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) // || // @@ -3995,6 +4032,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMAMCFastUnderSlow // Check if MC Fast Under Slow ... ((mConditions.isXCHMAMCFastUnderSlow || mConditions.isXCHMAMCFastCrossedUnderSlow) && @@ -4374,6 +4413,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMALCFastUnderSlow // Check LC Fast Under Slow ... ((mConditions.isXCHMALCFastUnderSlow || mConditions.isXCHMALCFastCrossedUnderSlow) && @@ -4417,6 +4458,21 @@ bool XUSPY5XTDHasLongSignal() // ) // + || + // + (mConditions.isXLHPriceInSignalRange && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // ) // ) @@ -4428,6 +4484,17 @@ bool XUSPY5XTDHasLongSignal() // (mConditions.isXLHPriceOverSignal && ( + // + (mConditions.isXTSAllSame && + mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHMASCOverMax && + mConditions.isXTDBullOverBear && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCCrossedOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || // ((mConditions.isXCHMALCVale && mConditions.isXTSCurrentMax) && @@ -4440,6 +4507,13 @@ bool XUSPY5XTDHasLongSignal() (mConditions.isXTMNeutural && mConditions.isXAMAStartBullish) // + || + // + (mConditions.isXTMStartBullish && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverMediest) + // ) // ) @@ -4769,6 +4843,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMASCTrendsDown ((mConditions.isXCHMASCTrendsDown && mConditions.isXCHMASCFastOverSlow) && ( @@ -4831,6 +4907,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMAMCTrendsDown ((mConditions.isXCHMAMCTrendsDown && mConditions.isXCHMAMCFastOverSlow) && ( @@ -5043,6 +5121,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // isXCHMALCTrendsDown ((mConditions.isXCHMALCTrendsDown && mConditions.isXCHMALCFastOverSlow) && ( @@ -5072,6 +5152,8 @@ bool XUSPY5XTDHasLongSignal() // || // + // XTD Long ... + // All Bullish ... ((mConditions.isXTMBullish && mConditions.isXAMABullish) && (