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 bb463df8..7a1f9b6b 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -1553,23 +1553,19 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check if MC Fast Under Slow ... - ((mConditions.isXCHMAMCFastUnderSlow || - mConditions.isXCHMAMCFastCrossedUnderSlow) && + (mConditions.isXTSCurrentUnderFarest && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) - // - || - // - (mConditions.isXCHMAMCVale && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverFarest && - mConditions.isXTSCurrentCrossedOverMediest) + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // ) // @@ -1577,15 +1573,41 @@ bool XUSPY5XTDHasLongSignal() // || // - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) && + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear) + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXCHMAMCVale && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) // ) // @@ -1604,7 +1626,29 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + (mConditions.isXAMAStartBullish && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1617,23 +1661,7 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - // - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) && - ( - // - (mConditions.isXTMNeutural && - mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) - // - ) - // - ) - // - ) + false) // ) // @@ -1673,13 +1701,21 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check if MC Fast Under Slow ... - ((mConditions.isXCHMAMCFastUnderSlow || - mConditions.isXCHMAMCFastCrossedUnderSlow) && + (mConditions.isXTSCurrentUnderNearest && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTMStartBullish && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) // ) // @@ -1687,16 +1723,74 @@ bool XUSPY5XTDHasLongSignal() // || // - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) && + (mConditions.isXTSCurrentUnderFarest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin && - mConditions.isXTDBearishVale && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear) + ( + (mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCHHSame) + // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXAMAStartBullish && + mConditions.isXCHMASCFastCrossedOverSlow) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXTMStartBullish && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) // ) // @@ -1715,29 +1809,7 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHHHSameInLength) && // ( - // - // Check if MC Fast Under Slow ... - ((mConditions.isXCHMAMCFastUnderSlow || - mConditions.isXCHMAMCFastCrossedUnderSlow) && - ( - // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) - // - || - // - (mConditions.isXCHMAMCVale && - mConditions.isXTMNeutural && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMax && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) - // - ) - // - ) - // - ) + false) // ) // @@ -1792,13 +1864,19 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check LC Fast Over Slow ... - ((mConditions.isXCHMALCFastOverSlow || - mConditions.isXCHMALCFastCrossedOverSlow) && + (mConditions.isXTSCurrentUnderNearest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMALCTrendsDown) + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) // ) // @@ -1811,19 +1889,71 @@ bool XUSPY5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) // || // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMAMCVale && - mConditions.isXCHMALCPeak && - mConditions.isXTDBearishVale && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXLHPriceCrossedOverSignal) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTDBearishVale) + // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check LC Fast Under Slow ... + ((mConditions.isXCHMALCFastUnderSlow || + mConditions.isXCHMALCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMNeutural || + mConditions.isXTMEndBullish) && + ( + // + (mConditions.isXTDSignalCrossedOverBear && + mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMin) + // + ) + // + ) // ) // @@ -1843,21 +1973,31 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check LC Fast Over Slow ... - ((mConditions.isXCHMALCFastOverSlow || - mConditions.isXCHMALCFastCrossedOverSlow) && + (mConditions.isXTSCurrentUnderNearest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMALCTrendsDown) - // - || - // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXTSCurrentUnderNearest && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedUnderNearest) + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1870,10 +2010,22 @@ bool XUSPY5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - (mConditions.isXCHLHSameHHs && - mConditions.isXTSCurrentMax && - mConditions.isXLHHighAttachedHH && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXLHHighAttachedHH + // + || + // + (mConditions.isXLHLLSameInLength && + mConditions.isXRSICrossedOverLongExit) + // + ) + // + ) // ) // diff --git a/BKP/Main/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 index fbce2192..3093b8d3 100644 --- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 @@ -80,7 +80,7 @@ input double xUSPY5MaxSupportedVolumePerTradeFactor = 0; input double xUSPY5IncreasedMaxSupportedVolumeRate = 0; // Increase Max Supported Volume based on Balance // // Trade Profits ... -input double xUSPY5MinRewardInPips = 6; // Minimum Reward Per Trade in Pips +input double xUSPY5MinRewardInPips = 3; // Minimum Reward Per Trade in Pips input double xUSPY5RiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips input double xUSPY5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index c0509f84..a758252c 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -12,37 +12,37 @@ All Markets XTD ---- -Resolve XUSCHF5 XTD All Stopouts in All Markets ... -Resolve XUSCHF5 XTD All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTD All Guard Attacks in All Markets ... +Resolve XUSPY5 XTD All Longs Stopouts in AMarkets-Real, GrowthNext ... +Resolve XUSPY5 XTD All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XTD All Guard Attacks in All Markets ... XTAM ----- -Resolve XUSCHF5 XTAM All Stopouts in All Markets ... -Resolve XUSCHF5 XTAM All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTAM All Guard Attacks in All Markets ... +Resolve XUSPY5 XTAM All Stopouts in All Markets ... +Resolve XUSPY5 XTAM All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XTAM All Guard Attacks in All Markets ... XSI ---- -Resolve XUSCHF5 XSI All Stopouts in All Markets ... -Resolve XUSCHF5 XSI Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XSI All Guard Attacks in All Markets ... +Resolve XUSPY5 XSI All Stopouts in All Markets ... +Resolve XUSPY5 XSI Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XSI All Guard Attacks in All Markets ... XTSFI ------ -Resolve XUSCHF5 XTSFI All Stopouts in All Markets ... -Resolve XUSCHF5 XTSFI All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XTSFI All Guard Attacks in All Markets ... +Resolve XUSPY5 XTSFI All Stopouts in All Markets ... +Resolve XUSPY5 XTSFI All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XTSFI All Guard Attacks in All Markets ... XCHMACC -------- -Resolve XUSCHF5 XCHMACC All Stopouts in All Markets ... -Resolve XUSCHF5 XCHMACC All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMACC All Guard Attacks in All Markets ... +Resolve XUSPY5 XCHMACC All Stopouts in All Markets ... +Resolve XUSPY5 XCHMACC All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XCHMACC All Guard Attacks in All Markets ... @@ -57,24 +57,24 @@ Resolve XUSCHF5 XCHMACC All Guard Attacks in All Markets ... XOBDLH -------- -Resolve XUSCHF5 XOBDLH All Stopouts in All Markets ... -Resolve XUSCHF5 XOBDLH Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XOBDLH Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XOBDLH All Guard Attacks in All Markets ... +Resolve XUSPY5 XOBDLH All Stopouts in All Markets ... +Resolve XUSPY5 XOBDLH Longs All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XOBDLH Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XOBDLH All Guard Attacks in All Markets ... XCHMAMX -------- -Resolve XUSCHF5 XCHMAMX All Stopouts in All Markets ... -Resolve XUSCHF5 XCHMAMX Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMAMX Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMAMX All Guard Attacks in All Markets ... +Resolve XUSPY5 XCHMAMX All Stopouts in All Markets ... +Resolve XUSPY5 XCHMAMX Longs All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XCHMAMX Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XCHMAMX All Guard Attacks in All Markets ... XCHMAMN -------- -Resolve XUSCHF5 XCHMAMN All Stopouts in All Markets ... -Resolve XUSCHF5 XCHMAMN Longs All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMAMN Shorts All Critical Guard Attacks in All Markets ... -Resolve XUSCHF5 XCHMAMN All Guard Attacks in All Markets ... +Resolve XUSPY5 XCHMAMN All Stopouts in All Markets ... +Resolve XUSPY5 XCHMAMN Longs All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XCHMAMN Shorts All Critical Guard Attacks in All Markets ... +Resolve XUSPY5 XCHMAMN All Guard Attacks in All Markets ... 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 bb463df8..7a1f9b6b 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -1553,23 +1553,19 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check if MC Fast Under Slow ... - ((mConditions.isXCHMAMCFastUnderSlow || - mConditions.isXCHMAMCFastCrossedUnderSlow) && + (mConditions.isXTSCurrentUnderFarest && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) - // - || - // - (mConditions.isXCHMAMCVale && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverFarest && - mConditions.isXTSCurrentCrossedOverMediest) + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // ) // @@ -1577,15 +1573,41 @@ bool XUSPY5XTDHasLongSignal() // || // - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) && + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear) + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXCHMAMCVale && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) // ) // @@ -1604,7 +1626,29 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + (mConditions.isXAMAStartBullish && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1617,23 +1661,7 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - // - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) && - ( - // - (mConditions.isXTMNeutural && - mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) - // - ) - // - ) - // - ) + false) // ) // @@ -1673,13 +1701,21 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check if MC Fast Under Slow ... - ((mConditions.isXCHMAMCFastUnderSlow || - mConditions.isXCHMAMCFastCrossedUnderSlow) && + (mConditions.isXTSCurrentUnderNearest && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTMStartBullish && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) // ) // @@ -1687,16 +1723,74 @@ bool XUSPY5XTDHasLongSignal() // || // - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) && + (mConditions.isXTSCurrentUnderFarest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin && - mConditions.isXTDBearishVale && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear) + ( + (mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCHHSame) + // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXAMAStartBullish && + mConditions.isXCHMASCFastCrossedOverSlow) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXTMStartBullish && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) // ) // @@ -1715,29 +1809,7 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHHHSameInLength) && // ( - // - // Check if MC Fast Under Slow ... - ((mConditions.isXCHMAMCFastUnderSlow || - mConditions.isXCHMAMCFastCrossedUnderSlow) && - ( - // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) - // - || - // - (mConditions.isXCHMAMCVale && - mConditions.isXTMNeutural && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMax && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) - // - ) - // - ) - // - ) + false) // ) // @@ -1792,13 +1864,19 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check LC Fast Over Slow ... - ((mConditions.isXCHMALCFastOverSlow || - mConditions.isXCHMALCFastCrossedOverSlow) && + (mConditions.isXTSCurrentUnderNearest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMALCTrendsDown) + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) // ) // @@ -1811,19 +1889,71 @@ bool XUSPY5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) // || // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMAMCVale && - mConditions.isXCHMALCPeak && - mConditions.isXTDBearishVale && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXLHPriceCrossedOverSignal) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTDBearishVale) + // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check LC Fast Under Slow ... + ((mConditions.isXCHMALCFastUnderSlow || + mConditions.isXCHMALCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMNeutural || + mConditions.isXTMEndBullish) && + ( + // + (mConditions.isXTDSignalCrossedOverBear && + mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMin) + // + ) + // + ) // ) // @@ -1843,21 +1973,31 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check LC Fast Over Slow ... - ((mConditions.isXCHMALCFastOverSlow || - mConditions.isXCHMALCFastCrossedOverSlow) && + (mConditions.isXTSCurrentUnderNearest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMALCTrendsDown) - // - || - // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXTSCurrentUnderNearest && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedUnderNearest) + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1870,10 +2010,22 @@ bool XUSPY5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - (mConditions.isXCHLHSameHHs && - mConditions.isXTSCurrentMax && - mConditions.isXLHHighAttachedHH && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXLHHighAttachedHH + // + || + // + (mConditions.isXLHLLSameInLength && + mConditions.isXRSICrossedOverLongExit) + // + ) + // + ) // ) // diff --git a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 index fbce2192..3093b8d3 100644 --- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 +++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 @@ -80,7 +80,7 @@ input double xUSPY5MaxSupportedVolumePerTradeFactor = 0; input double xUSPY5IncreasedMaxSupportedVolumeRate = 0; // Increase Max Supported Volume based on Balance // // Trade Profits ... -input double xUSPY5MinRewardInPips = 6; // Minimum Reward Per Trade in Pips +input double xUSPY5MinRewardInPips = 3; // Minimum Reward Per Trade in Pips input double xUSPY5RiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips input double xUSPY5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 index bb463df8..7a1f9b6b 100644 --- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 @@ -1553,23 +1553,19 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check if MC Fast Under Slow ... - ((mConditions.isXCHMAMCFastUnderSlow || - mConditions.isXCHMAMCFastCrossedUnderSlow) && + (mConditions.isXTSCurrentUnderFarest && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) - // - || - // - (mConditions.isXCHMAMCVale && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXCHLHMCLCLLSame && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverFarest && - mConditions.isXTSCurrentCrossedOverMediest) + ((mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMAMCFastOverSlow) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame) + // + ) + // + ) // ) // @@ -1577,15 +1573,41 @@ bool XUSPY5XTDHasLongSignal() // || // - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) && + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear) + (mConditions.isXTDSignalCrossedOverBear && + ( + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + (mConditions.isXTSAllSame && + mConditions.isXCHMAMCVale && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) // ) // @@ -1604,7 +1626,29 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHHHSameInLength) && // ( - false) + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + (mConditions.isXAMAStartBullish && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBullOverBear && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1617,23 +1661,7 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHLLSameInLength) && // ( - // - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) && - ( - // - (mConditions.isXTMNeutural && - mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMax && - mConditions.isXTDBearishVale && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) - // - ) - // - ) - // - ) + false) // ) // @@ -1673,13 +1701,21 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check if MC Fast Under Slow ... - ((mConditions.isXCHMAMCFastUnderSlow || - mConditions.isXCHMAMCFastCrossedUnderSlow) && + (mConditions.isXTSCurrentUnderNearest && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale) && + ( + // + (mConditions.isXTDBearishVale && + mConditions.isXTMStartBullish && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) // ) // @@ -1687,16 +1723,74 @@ bool XUSPY5XTDHasLongSignal() // || // - ((mConditions.isXCHMAMCTrendsDown && - mConditions.isXCHMAMCFastOverSlow) && + (mConditions.isXTSCurrentUnderFarest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXTSCurrentMin && - mConditions.isXTDBearishVale && - mConditions.isXCHLHMCLCHHSame && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear) + ( + (mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMin && + mConditions.isXCHLHMCLCHHSame) + // + || + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXAMAStartBullish && + mConditions.isXCHMASCFastCrossedOverSlow) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check if MC Fast Under Slow ... + ((mConditions.isXCHMAMCFastUnderSlow || + mConditions.isXCHMAMCFastCrossedUnderSlow) && + ( + // + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXTMStartBullish && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) // ) // @@ -1715,29 +1809,7 @@ bool XUSPY5XTDHasLongSignal() !mConditions.isXLHHHSameInLength) && // ( - // - // Check if MC Fast Under Slow ... - ((mConditions.isXCHMAMCFastUnderSlow || - mConditions.isXCHMAMCFastCrossedUnderSlow) && - ( - // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) - // - || - // - (mConditions.isXCHMAMCVale && - mConditions.isXTMNeutural && - mConditions.isXCHMALCVale && - mConditions.isXTSCurrentMax && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedOverNearest) - // - ) - // - ) - // - ) + false) // ) // @@ -1792,13 +1864,19 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check LC Fast Over Slow ... - ((mConditions.isXCHMALCFastOverSlow || - mConditions.isXCHMALCFastCrossedOverSlow) && + (mConditions.isXTSCurrentUnderNearest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMALCTrendsDown) + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMASCOverMax && + mConditions.isXTSCurrentCrossedUnderNearest && + mConditions.isXTSCurrentCrossedUnderMediest) + // + ) + // + ) // ) // @@ -1811,19 +1889,71 @@ bool XUSPY5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - (mConditions.isXCHMAMCVale && - mConditions.isXCHMAMCTrendsUp) + (mConditions.isXTSCurrentUnderFarest && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXLHPriceCrossedOverSignal) + // + ) + // + ) // || // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXCHMAMCVale && - mConditions.isXCHMALCPeak && - mConditions.isXTDBearishVale && - mConditions.isXTSCurrentUnderFarest && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXLHPriceCrossedOverSignal) + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXLHPriceCrossedOverSignal) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXTDBearishVale) + // + || + // + (mConditions.isXLHHHDecreased && + mConditions.isXAMAStartBullish) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + // Check LC Fast Under Slow ... + ((mConditions.isXCHMALCFastUnderSlow || + mConditions.isXCHMALCFastCrossedUnderSlow) && + ( + // + ((mConditions.isXTMNeutural || + mConditions.isXTMEndBullish) && + ( + // + (mConditions.isXTDSignalCrossedOverBear && + mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXLHLLIncreased && + mConditions.isXCHMASCOverMin) + // + ) + // + ) // ) // @@ -1843,21 +1973,31 @@ bool XUSPY5XTDHasLongSignal() // ( // - // Check LC Fast Over Slow ... - ((mConditions.isXCHMALCFastOverSlow || - mConditions.isXCHMALCFastCrossedOverSlow) && + (mConditions.isXTSCurrentUnderNearest && ( // - (mConditions.isXCHMALCPeak && - mConditions.isXCHMALCTrendsDown) - // - || - // - (mConditions.isXTMBullish && - mConditions.isXAMABullish && - mConditions.isXTSCurrentUnderNearest && - mConditions.isXTDSignalCrossedOverBear && - mConditions.isXTSCurrentCrossedUnderNearest) + (mConditions.isXTSCurrentCrossedUnderNearest && + ( + // + ((mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale) + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHMASCOverMax) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1870,10 +2010,22 @@ bool XUSPY5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - (mConditions.isXCHLHSameHHs && - mConditions.isXTSCurrentMax && - mConditions.isXLHHighAttachedHH && - mConditions.isXTDSignalCrossedOverBear) + ((mConditions.isXCHMAMCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXLHHighAttachedHH + // + || + // + (mConditions.isXLHLLSameInLength && + mConditions.isXRSICrossedOverLongExit) + // + ) + // + ) // ) // diff --git a/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 index fbce2192..3093b8d3 100644 --- a/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 +++ b/Providers/x-saherelm.xuspy5.provider.inputs.lib.mq5 @@ -80,7 +80,7 @@ input double xUSPY5MaxSupportedVolumePerTradeFactor = 0; input double xUSPY5IncreasedMaxSupportedVolumeRate = 0; // Increase Max Supported Volume based on Balance // // Trade Profits ... -input double xUSPY5MinRewardInPips = 6; // Minimum Reward Per Trade in Pips +input double xUSPY5MinRewardInPips = 3; // Minimum Reward Per Trade in Pips input double xUSPY5RiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips input double xUSPY5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades //