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 78778559..40a0a1db 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -38182,120 +38182,149 @@ bool XUSPY5XCHMACCHasShortSignal() // Price Under Signal ... ((mConditions.isXLHPriceUnderSignal || mConditions.isXLHPriceCrossedUnderSignal) && - ( - // - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if SC Fast Over Slow ... - ((mConditions.isXCHMASCFastOverSlow || - mConditions.isXCHMASCFastCrossedOverSlow) && - ( - // - false + ( + // + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if SC Fast Over Slow ... + ((mConditions.isXCHMASCFastOverSlow || + mConditions.isXCHMASCFastCrossedOverSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if MC Fast Over Slow ... - ((mConditions.isXCHMAMCFastOverSlow || - mConditions.isXCHMAMCFastCrossedOverSlow) && - ( - // - false + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if LC Fast Over Slow ... - ((mConditions.isXCHMALCFastOverSlow || - mConditions.isXCHMALCFastCrossedOverSlow) && - ( - // - false + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if SC Fast Under Slow But Trends Down ... - ((mConditions.isXCHMASCTrendsDown && - mConditions.isXCHMASCFastUnderSlow) && - ( - // - false + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if SC Fast Under Slow But Trends Down ... + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if MC Fast Under Slow But Trends Down ... - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastUnderSlow) && - ( - // - (mConditions.isXTDBullOverBear && - ( - // - (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXLHHHIncreased && - mConditions.isXLHPriceCrossedUnderSignal) + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if MC Fast Under Slow But Trends Down ... + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXLHHHIncreased && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) // ) + // + ) + // + ) + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if LC Fast Under Slow But Trends Down ... + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + false + // + ) + // + ) + // + ) + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // All Bearish ... + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((!mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) // ) - // - ) + // + ) // ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if LC Fast Under Slow But Trends Down ... - ((mConditions.isXCHMALCTrendsDown && - mConditions.isXCHMALCFastUnderSlow) && - ( - // - false - // - ) - // - ) - // - ) + // + ) // ) // @@ -38633,7 +38662,25 @@ bool XUSPY5XCHMACCHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - false + (mConditions.isXTDBullCrossedOverBear && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMANeutural && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // + ) + // + ) // ) // @@ -38754,6 +38801,21 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXFIOverZero && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) 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 78778559..40a0a1db 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -38182,120 +38182,149 @@ bool XUSPY5XCHMACCHasShortSignal() // Price Under Signal ... ((mConditions.isXLHPriceUnderSignal || mConditions.isXLHPriceCrossedUnderSignal) && - ( - // - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if SC Fast Over Slow ... - ((mConditions.isXCHMASCFastOverSlow || - mConditions.isXCHMASCFastCrossedOverSlow) && - ( - // - false + ( + // + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if SC Fast Over Slow ... + ((mConditions.isXCHMASCFastOverSlow || + mConditions.isXCHMASCFastCrossedOverSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if MC Fast Over Slow ... - ((mConditions.isXCHMAMCFastOverSlow || - mConditions.isXCHMAMCFastCrossedOverSlow) && - ( - // - false + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if LC Fast Over Slow ... - ((mConditions.isXCHMALCFastOverSlow || - mConditions.isXCHMALCFastCrossedOverSlow) && - ( - // - false + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if SC Fast Under Slow But Trends Down ... - ((mConditions.isXCHMASCTrendsDown && - mConditions.isXCHMASCFastUnderSlow) && - ( - // - false + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if SC Fast Under Slow But Trends Down ... + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if MC Fast Under Slow But Trends Down ... - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastUnderSlow) && - ( - // - (mConditions.isXTDBullOverBear && - ( - // - (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXLHHHIncreased && - mConditions.isXLHPriceCrossedUnderSignal) + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if MC Fast Under Slow But Trends Down ... + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXLHHHIncreased && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) // ) + // + ) + // + ) + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if LC Fast Under Slow But Trends Down ... + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + false + // + ) + // + ) + // + ) + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // All Bearish ... + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((!mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) // ) - // - ) + // + ) // ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if LC Fast Under Slow But Trends Down ... - ((mConditions.isXCHMALCTrendsDown && - mConditions.isXCHMALCFastUnderSlow) && - ( - // - false - // - ) - // - ) - // - ) + // + ) // ) // @@ -38633,7 +38662,25 @@ bool XUSPY5XCHMACCHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - false + (mConditions.isXTDBullCrossedOverBear && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMANeutural && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // + ) + // + ) // ) // @@ -38754,6 +38801,21 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXFIOverZero && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // ) diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index 78778559..40a0a1db 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -38182,120 +38182,149 @@ bool XUSPY5XCHMACCHasShortSignal() // Price Under Signal ... ((mConditions.isXLHPriceUnderSignal || mConditions.isXLHPriceCrossedUnderSignal) && - ( - // - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if SC Fast Over Slow ... - ((mConditions.isXCHMASCFastOverSlow || - mConditions.isXCHMASCFastCrossedOverSlow) && - ( - // - false + ( + // + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if SC Fast Over Slow ... + ((mConditions.isXCHMASCFastOverSlow || + mConditions.isXCHMASCFastCrossedOverSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if MC Fast Over Slow ... - ((mConditions.isXCHMAMCFastOverSlow || - mConditions.isXCHMAMCFastCrossedOverSlow) && - ( - // - false + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if MC Fast Over Slow ... + ((mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if LC Fast Over Slow ... - ((mConditions.isXCHMALCFastOverSlow || - mConditions.isXCHMALCFastCrossedOverSlow) && - ( - // - false + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if LC Fast Over Slow ... + ((mConditions.isXCHMALCFastOverSlow || + mConditions.isXCHMALCFastCrossedOverSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if SC Fast Under Slow But Trends Down ... - ((mConditions.isXCHMASCTrendsDown && - mConditions.isXCHMASCFastUnderSlow) && - ( - // - false + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if SC Fast Under Slow But Trends Down ... + ((mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastUnderSlow) && + ( + // + false + // + ) // ) - // - ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if MC Fast Under Slow But Trends Down ... - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastUnderSlow) && - ( - // - (mConditions.isXTDBullOverBear && - ( - // - (mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMin && - mConditions.isXLHHHIncreased && - mConditions.isXLHPriceCrossedUnderSignal) + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if MC Fast Under Slow But Trends Down ... + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXTDBullOverBear && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXLHHHIncreased && + mConditions.isXLHPriceCrossedUnderSignal) + // + ) // ) + // + ) + // + ) + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // Check if LC Fast Under Slow But Trends Down ... + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastUnderSlow) && + ( + // + false + // + ) + // + ) + // + ) + // + || + // + // XCHMACC Short ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Under Signal ... + // All Bearish ... + ((mConditions.isXTMBearish && + mConditions.isXAMABearish) && + ( + // + ((!mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastUnderSlow) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest) // ) - // - ) + // + ) // ) - // - || - // - // XCHMACC Short ... - // Resolve Stop Outs ... - // Both HH and LL Same In Length ... - // Price Under Signal ... - // Check if LC Fast Under Slow But Trends Down ... - ((mConditions.isXCHMALCTrendsDown && - mConditions.isXCHMALCFastUnderSlow) && - ( - // - false - // - ) - // - ) - // - ) + // + ) // ) // @@ -38633,7 +38662,25 @@ bool XUSPY5XCHMACCHasShortSignal() mConditions.isXCHMAMCFastUnderSlow) && ( // - false + (mConditions.isXTDBullCrossedOverBear && + ( + // + (mConditions.isXTSCurrentOverMediest && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXAMANeutural && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMASCCrossedUnderMin) + // + ) + // + ) + // + ) + // + ) // ) // @@ -38754,6 +38801,21 @@ bool XUSPY5XCHMACCHasShortSignal() // ) // + || + // + (mConditions.isXFIOverZero && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMin && + mConditions.isXCHMASCUnderMin && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) + // ) // )