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 5d1edf1f..b006c09d 100644 --- a/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 @@ -1582,7 +1582,12 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) // ) // @@ -1633,7 +1638,14 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTMNeutural && + mConditions.isXTMEndBullish) // ) // @@ -1697,7 +1709,191 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderNearest && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXAMABearish && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXTDBearishVale) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastOverSlow) && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + ((mConditions.isXFIUnderZero && + mConditions.isXFICrossedUnderZero) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXAMAStartBullish) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXCHLHMCLCHHSame + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1812,7 +2008,12 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + !mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) // ) // @@ -1829,7 +2030,57 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHMAMCPeak && + mConditions.isXTDBearishVale && + mConditions.isXTSCurrentMax && + mConditions.isXTMStartBullish && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -1886,6 +2137,29 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + // XTD Long ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Over Signal ... + // All Bullish ... + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCOverMax && + (mConditions.isXCHMAMCTrendsDown && + (mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow))) + // + ) + // + ) + // ) // ) @@ -2288,7 +2562,13 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXLHHighAttachedHH) // ) // @@ -2305,7 +2585,49 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + mConditions.isXRSICrossedOverLongExit + // + || + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax) && + ( + // + (mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2356,7 +2678,24 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - false + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + mConditions.isXRSICrossedOverLongExit + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXCHMASCCrossedOverMax) + // + ) + // + ) // ) // @@ -2649,7 +2988,14 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) // ) // @@ -2781,7 +3127,11 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMax && + mConditions.isXLHLLIncreased && + mConditions.isXCHLHMCLCHHSame) // ) // diff --git a/BKP/Main/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 b/BKP/Main/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 index 56f3a414..4dd6f477 100644 --- a/BKP/Main/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 +++ b/BKP/Main/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 @@ -80,7 +80,7 @@ input double xGPUS5MaxSupportedVolumePerTradeFactor = 0; input double xGPUS5IncreasedMaxSupportedVolumeRate = 0; // Increase Max Supported Volume based on Balance // // Trade Profits ... -input double xGPUS5MinRewardInPips = 60; // Minimum Reward Per Trade in Pips +input double xGPUS5MinRewardInPips = 6.0; // Minimum Reward Per Trade in Pips input double xGPUS5RiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips input double xGPUS5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // @@ -212,7 +212,7 @@ bool XGPUS5ValidateInputs() // result = xGPUS5CriticalDrawDownFactor == 0 || (xGPUS5CriticalDrawDownFactor > 0 && - xGPUS5CriticalDrawDownFactor < 1); + xGPUS5CriticalDrawDownFactor < 1); if (!result) { // @@ -225,7 +225,7 @@ bool XGPUS5ValidateInputs() // result = xGPUS5MaxAllowedDrawDownFactor == 0 || (xGPUS5MaxAllowedDrawDownFactor > 0 && - xGPUS5MaxAllowedDrawDownFactor < 1); + xGPUS5MaxAllowedDrawDownFactor < 1); if (!result) { // diff --git a/Documents/XAU5-Guards/Guards.yml b/Documents/Guards/Guards.yml similarity index 100% rename from Documents/XAU5-Guards/Guards.yml rename to Documents/Guards/Guards.yml diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt index 6eb88c9b..d36befcb 100644 --- a/Documents/Templates/Brokers List.txt +++ b/Documents/Templates/Brokers List.txt @@ -14,36 +14,36 @@ Resolve Guard Attacks ... XTD ---- -Resolve XUSPY5 XTD All Stopouts in All Markets ... -Resolve XUSPY5 XTD All Longs Critical Guard Attacks in All Markets ... -Resolve XUSPY5 XTD All Guard Attacks in All Markets ... +Resolve XGBUS5 XTD Long Stopouts in AMarkets-Real ... +Resolve XGBUS5 XTD All Longs Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XTD All Guard Attacks in All Markets ... XTAM ----- -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 ... +Resolve XGBUS5 XTAM All Stopouts in All Markets ... +Resolve XGBUS5 XTAM All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XTAM All Guard Attacks in All Markets ... XSI ---- -Resolve XUSPY5 XSI All Stopouts in All Markets ... -Resolve XUSPY5 XSI All Critical Guard Attacks in All Markets ... -Resolve XUSPY5 XSI All Guard Attacks in All Markets ... +Resolve XGBUS5 XSI All Stopouts in All Markets ... +Resolve XGBUS5 XSI All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XSI All Guard Attacks in All Markets ... XTSFI ------ -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 ... +Resolve XGBUS5 XTSFI All Stopouts in All Markets ... +Resolve XGBUS5 XTSFI All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XTSFI All Guard Attacks in All Markets ... XCHMACC -------- -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 ... +Resolve XGBUS5 XCHMACC All Stopouts in All Markets ... +Resolve XGBUS5 XCHMACC All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XCHMACC All Guard Attacks in All Markets ... @@ -57,24 +57,24 @@ Resolve XUSPY5 XCHMACC All Guard Attacks in All Markets ... XOBDLH -------- -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 ... +Resolve XGBUS5 XOBDLH All Stopouts in All Markets ... +Resolve XGBUS5 XOBDLH Longs All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XOBDLH Shorts All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XOBDLH All Guard Attacks in All Markets ... XCHMAMX -------- -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 ... +Resolve XGBUS5 XCHMAMX All Stopouts in All Markets ... +Resolve XGBUS5 XCHMAMX Longs All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XCHMAMX Shorts All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XCHMAMX All Guard Attacks in All Markets ... XCHMAMN -------- -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 ... +Resolve XGBUS5 XCHMAMN All Stopouts in All Markets ... +Resolve XGBUS5 XCHMAMN Longs All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XCHMAMN Shorts All Critical Guard Attacks in All Markets ... +Resolve XGBUS5 XCHMAMN All Guard Attacks in All Markets ... 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 5d1edf1f..b006c09d 100644 --- a/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 +++ b/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 @@ -1582,7 +1582,12 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) // ) // @@ -1633,7 +1638,14 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTMNeutural && + mConditions.isXTMEndBullish) // ) // @@ -1697,7 +1709,191 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderNearest && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXAMABearish && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXTDBearishVale) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastOverSlow) && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + ((mConditions.isXFIUnderZero && + mConditions.isXFICrossedUnderZero) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXAMAStartBullish) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXCHLHMCLCHHSame + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1812,7 +2008,12 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + !mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) // ) // @@ -1829,7 +2030,57 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHMAMCPeak && + mConditions.isXTDBearishVale && + mConditions.isXTSCurrentMax && + mConditions.isXTMStartBullish && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -1886,6 +2137,29 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + // XTD Long ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Over Signal ... + // All Bullish ... + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCOverMax && + (mConditions.isXCHMAMCTrendsDown && + (mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow))) + // + ) + // + ) + // ) // ) @@ -2288,7 +2562,13 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXLHHighAttachedHH) // ) // @@ -2305,7 +2585,49 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + mConditions.isXRSICrossedOverLongExit + // + || + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax) && + ( + // + (mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2356,7 +2678,24 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - false + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + mConditions.isXRSICrossedOverLongExit + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXCHMASCCrossedOverMax) + // + ) + // + ) // ) // @@ -2649,7 +2988,14 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) // ) // @@ -2781,7 +3127,11 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMax && + mConditions.isXLHLLIncreased && + mConditions.isXCHLHMCLCHHSame) // ) // diff --git a/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 b/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 index 56f3a414..4dd6f477 100644 --- a/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 +++ b/Projects/XGPUS5/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 @@ -80,7 +80,7 @@ input double xGPUS5MaxSupportedVolumePerTradeFactor = 0; input double xGPUS5IncreasedMaxSupportedVolumeRate = 0; // Increase Max Supported Volume based on Balance // // Trade Profits ... -input double xGPUS5MinRewardInPips = 60; // Minimum Reward Per Trade in Pips +input double xGPUS5MinRewardInPips = 6.0; // Minimum Reward Per Trade in Pips input double xGPUS5RiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips input double xGPUS5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // @@ -212,7 +212,7 @@ bool XGPUS5ValidateInputs() // result = xGPUS5CriticalDrawDownFactor == 0 || (xGPUS5CriticalDrawDownFactor > 0 && - xGPUS5CriticalDrawDownFactor < 1); + xGPUS5CriticalDrawDownFactor < 1); if (!result) { // @@ -225,7 +225,7 @@ bool XGPUS5ValidateInputs() // result = xGPUS5MaxAllowedDrawDownFactor == 0 || (xGPUS5MaxAllowedDrawDownFactor > 0 && - xGPUS5MaxAllowedDrawDownFactor < 1); + xGPUS5MaxAllowedDrawDownFactor < 1); if (!result) { // diff --git a/Projects/XGPUS5/Settings/XTD.set b/Projects/XGPUS5/Settings/XTD.set new file mode 100644 index 00000000..91743277 Binary files /dev/null and b/Projects/XGPUS5/Settings/XTD.set differ diff --git a/Projects/XGPUS5/Settings/longs.vbb.set b/Projects/XGPUS5/Settings/longs.vbb.set deleted file mode 100644 index cfa559b5..00000000 Binary files a/Projects/XGPUS5/Settings/longs.vbb.set and /dev/null differ diff --git a/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 index 5d1edf1f..b006c09d 100644 --- a/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 +++ b/Providers/x-saherelm.xgpus5.provider.indicators.lib.mq5 @@ -1582,7 +1582,12 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) // ) // @@ -1633,7 +1638,14 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastOverSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHSCMCLLSame && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverFarest && + mConditions.isXTSCurrentCrossedOverNearest && + mConditions.isXTMNeutural && + mConditions.isXTMEndBullish) // ) // @@ -1697,7 +1709,191 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderNearest && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCPeak && + mConditions.isXCHLHMCLCHHSame) && + ( + // + (mConditions.isXAMAVale && + mConditions.isXAMABearish && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXTDBearishVale) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + || + // + (mConditions.isXTMEndBullish && + mConditions.isXAMAEndBullish) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderFarest && + ( + // + ((!mConditions.isXCHMASCTrendsUp && + !mConditions.isXCHMASCTrendsDown && + mConditions.isXCHMASCFastOverSlow) && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTDBearishVale && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) && + ( + // + ((mConditions.isXFIUnderZero && + mConditions.isXFICrossedUnderZero) && + ( + // + (mConditions.isXTMNeutural && + mConditions.isXAMANeutural) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) && + ( + // + (mConditions.isXCHMAMCTrendsUp && + ( + // + ((mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax) && + ( + // + (mConditions.isXCHMAMCVale && + mConditions.isXAMAStartBullish) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMASCOverMin && + mConditions.isXCHMASCUnderMax && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // + ((mConditions.isXTMNeutural && + mConditions.isXAMANeutural) && + ( + // + ((mConditions.isXCHMAMCVale && + mConditions.isXTSCurrentMax && + mConditions.isXTDBearishVale && + mConditions.isXTDSignalCrossedOverBear) && + ( + // + mConditions.isXCHLHMCLCHHSame + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXCHMASCUnderMin) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) + // + ) // ) // @@ -1812,7 +2008,12 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + !mConditions.isXCHMAMCTrendsUp && + !mConditions.isXCHMAMCTrendsDown && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) // ) // @@ -1829,7 +2030,57 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXTMBullish && + mConditions.isXAMABullish && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXTSCurrentOverFarest && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + ) + // + ) + // + || + // + (mConditions.isXTSCurrentUnderMediest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTDSignalCrossedOverBear) + // + ) + // + ) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCVale && + mConditions.isXCHMAMCPeak && + mConditions.isXTDBearishVale && + mConditions.isXTSCurrentMax && + mConditions.isXTMStartBullish && + mConditions.isXTDSignalCrossedOverBear && + mConditions.isXTSCurrentCrossedOverNearest) + // + ) + // + ) // ) // @@ -1886,6 +2137,29 @@ bool XGPUS5XTDHasLongSignal() // ) // + || + // + // XTD Long ... + // Resolve Stop Outs ... + // Both HH and LL Same In Length ... + // Price Over Signal ... + // All Bullish ... + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + (mConditions.isXCHMALCPeak && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCOverMax && + (mConditions.isXCHMAMCTrendsDown && + (mConditions.isXCHMAMCFastOverSlow || + mConditions.isXCHMAMCFastCrossedOverSlow))) + // + ) + // + ) + // ) // ) @@ -2288,7 +2562,13 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHLHMCLCLLSame && + mConditions.isXLHHighAttachedHH) // ) // @@ -2305,7 +2585,49 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXTSCurrentUnderNearest && + ( + // + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXTSCurrentCrossedUnderNearest) + // + ) + // + ) + // + || + // + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + mConditions.isXRSICrossedOverLongExit + // + || + // + ((mConditions.isXCHMAMCPeak && + mConditions.isXTSCurrentMax) && + ( + // + (mConditions.isXCHLHSameHHs && + mConditions.isXCHMASCOverMax && + mConditions.isXTDSignalCrossedOverBear) + // + || + // + (mConditions.isXCHMALCVale && + mConditions.isXCHLHSCMCHHSame && + mConditions.isXLHHighAttachedHH) + // + ) + // + ) + // + ) + // + ) // ) // @@ -2356,7 +2678,24 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastOverSlow) && ( // - false + ((mConditions.isXTMBullish && + mConditions.isXAMABullish) && + ( + // + mConditions.isXRSICrossedOverLongExit + // + || + // + (mConditions.isXCHMALCPeak && + mConditions.isXCHLHSameHHs && + mConditions.isXTSCurrentMax && + mConditions.isXCHMASCOverMax && + mConditions.isXLHHighAttachedHH && + mConditions.isXCHMASCCrossedOverMax) + // + ) + // + ) // ) // @@ -2649,7 +2988,14 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMAMCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMAMCVale && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMax && + mConditions.isXCHLHMCLCHHSame && + mConditions.isXCHMASCUnderMin && + mConditions.isXCHMAMCTrendsUp && + mConditions.isXCHMALCTrendsDown && + mConditions.isXCHMALCFastOverSlow) // ) // @@ -2781,7 +3127,11 @@ bool XGPUS5XTDHasLongSignal() mConditions.isXCHMALCFastCrossedUnderSlow) && ( // - false + (mConditions.isXCHMAMCPeak && + mConditions.isXCHMALCVale && + mConditions.isXTSCurrentMax && + mConditions.isXLHLLIncreased && + mConditions.isXCHLHMCLCHHSame) // ) // diff --git a/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 b/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 index 56f3a414..4dd6f477 100644 --- a/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 +++ b/Providers/x-saherelm.xgpus5.provider.inputs.lib.mq5 @@ -80,7 +80,7 @@ input double xGPUS5MaxSupportedVolumePerTradeFactor = 0; input double xGPUS5IncreasedMaxSupportedVolumeRate = 0; // Increase Max Supported Volume based on Balance // // Trade Profits ... -input double xGPUS5MinRewardInPips = 60; // Minimum Reward Per Trade in Pips +input double xGPUS5MinRewardInPips = 6.0; // Minimum Reward Per Trade in Pips input double xGPUS5RiskFreeStepInPips = 0; // Make Trades Risk Free Steps in Pips input double xGPUS5RiskFreeRate = 0; // Volume Multiplier for Risk Free Trades // @@ -212,7 +212,7 @@ bool XGPUS5ValidateInputs() // result = xGPUS5CriticalDrawDownFactor == 0 || (xGPUS5CriticalDrawDownFactor > 0 && - xGPUS5CriticalDrawDownFactor < 1); + xGPUS5CriticalDrawDownFactor < 1); if (!result) { // @@ -225,7 +225,7 @@ bool XGPUS5ValidateInputs() // result = xGPUS5MaxAllowedDrawDownFactor == 0 || (xGPUS5MaxAllowedDrawDownFactor > 0 && - xGPUS5MaxAllowedDrawDownFactor < 1); + xGPUS5MaxAllowedDrawDownFactor < 1); if (!result) { //