diff --git a/Classes/x-saherelm.x121.setup.class.mq5 b/Classes/x-saherelm.x121.setup.class.mq5 index 5171b615..d760aa6b 100644 --- a/Classes/x-saherelm.x121.setup.class.mq5 +++ b/Classes/x-saherelm.x121.setup.class.mq5 @@ -2191,36 +2191,56 @@ struct X121SignalGenerator // XPV ... ( // - conditions.pvConditions.isNewPeak && - conditions.pvConditions.isNewPeakOverLast && - conditions.pvConditions.isFiboIncreased && - conditions.pvConditions.isCloseOverFib1 && - conditions.pvConditions.isCloseOverFib2 && - conditions.pvConditions.isCloseOverFib3 && - conditions.pvConditions.isCloseOverFib4 && - conditions.pvConditions.isCloseOverFib5 && ( // + conditions.pvConditions.isNewPeak && + conditions.pvConditions.isNewPeakOverLast && + conditions.pvConditions.isFiboIncreased && + conditions.pvConditions.isCloseOverFib1 && + conditions.pvConditions.isCloseOverFib2 && + conditions.pvConditions.isCloseOverFib3 && + conditions.pvConditions.isCloseOverFib4 && + conditions.pvConditions.isCloseOverFib5 && ( // - conditions.pvConditions.isSCBullish && - conditions.pvConditions.isSCHHBullish && - conditions.pvConditions.isSCLLBullish && - // - conditions.pvConditions.isHCBullish && - conditions.pvConditions.isHCHHBullish && - conditions.pvConditions.isHCLLBullish && - // - !conditions.pvConditions.isMCBullish && - !conditions.pvConditions.isMCLLBullish && - // - !conditions.pvConditions.isLCBullish && - !conditions.pvConditions.isLCLLBullish + ( + // + conditions.pvConditions.isSCBullish && + conditions.pvConditions.isSCHHBullish && + conditions.pvConditions.isSCLLBullish && + // + conditions.pvConditions.isHCBullish && + conditions.pvConditions.isHCHHBullish && + conditions.pvConditions.isHCLLBullish && + // + !conditions.pvConditions.isMCBullish && + !conditions.pvConditions.isMCLLBullish && + // + !conditions.pvConditions.isLCBullish && + !conditions.pvConditions.isLCLLBullish + // + ) // ) // ) // + || + // + ( + // + conditions.pvConditions.isCloseUnderFib1 && + conditions.pvConditions.isCloseUnderFib2 && + conditions.pvConditions.isCloseUnderFib3 && + conditions.pvConditions.isCloseUnderFib4 && + conditions.pvConditions.isCloseUnderFib5 && + // + !conditions.pvConditions.isSCLLBearish && + !conditions.pvConditions.isLCLLBullish && + !conditions.pvConditions.isHCLLBullish + // + ) + // ) // || @@ -2309,6 +2329,11 @@ struct X121SignalGenerator // || // + (!conditions.chmaConditions.isFastOverSlow && + !conditions.chmaConditions.isFastUnderSlow) + // + || + // ( // conditions.chmaConditions.isRetestFastSlow && @@ -3595,16 +3620,215 @@ struct X121SignalGenerator // Set Default Result to True ... result = true; - // // - // result = - // // - // result && - // !( - // // - // // - // ) - // // - // ; + // + result = + // + result && + !( + // + // XSCORES ... + ( + // + bullishScore < 5 && + bearishScore > bullishScore * 10 + // + ) + // + || + // + // XMRB ... + ( + // + ( + // + conditions.mrbConditions.isFastOverSlow + // + ) + // + ) + // + || + // + // XCM ... + ( + // + ( + // + (conditions.mcConditions.isFastOverSlow || + conditions.mcConditions.isFastOverVerifier) + // + || + // + (!conditions.mcConditions.isSARBullish && + !conditions.mcConditions.isSARBearish) + // + || + // + (!conditions.mcConditions.isBullish && + !conditions.mcConditions.isBearish && + conditions.mcConditions.isSARBullish && + conditions.mcConditions.isFastOverVerifier && + conditions.mcConditions.isSlowOverVerifier) + // + ) + // + ) + // + || + // + // XICH ... + ( + // + (conditions.ichConditions.isClosedOverKijunSen && + conditions.ichConditions.isTenkanSenUnderKijunSen) + // + || + // + (conditions.ichConditions.isSenkouSpanAUnderB && + !conditions.ichConditions.isSenkouSpanAOverLast) + // + || + // + (conditions.ichConditions.isSenkouSpanAOverB && + conditions.ichConditions.isSenkouSpanAUnderLast) + // + || + // + (conditions.ichConditions.isSenkouSpanAOverB && + conditions.ichConditions.isSenkouSpanAOverLast) + // + || + // + (conditions.ichConditions.isFutureSenkouSpanAOverB && + conditions.ichConditions.isFutureSenkouSpanAUnderLast) + // + || + // + (conditions.ichConditions.isClosedUnderKijunSen && + conditions.ichConditions.isTenkanSenUnderKijunSen && + conditions.ichConditions.isSenkouSpanAUnderB && + conditions.ichConditions.isSenkouSpanAOverLast) + // + || + // + (!conditions.ichConditions.isTenkanSenOverKijunSen && + !conditions.ichConditions.isTenkanSenUnderKijunSen && + conditions.ichConditions.isSenkouSpanAUnderB && + conditions.ichConditions.isClosedUnderKijunSen && + conditions.ichConditions.isSenkouSpanAOverLast && + conditions.ichConditions.isSenkouSpanACrossedOverLast) + // + ) + // + || + // + // XPV ... + ( + // + ( + // + ( + // + conditions.pvConditions.isNewVale && + conditions.pvConditions.isNewValeUnderLast && + conditions.pvConditions.isFiboDecreased && + conditions.pvConditions.isCloseUnderFib1 && + conditions.pvConditions.isCloseUnderFib2 && + conditions.pvConditions.isCloseUnderFib3 && + conditions.pvConditions.isCloseUnderFib4 && + conditions.pvConditions.isCloseUnderFib5 + // + ) + // + && + // + ( + // + (!conditions.pvConditions.isMCBearish || + !conditions.pvConditions.isMCHHBearish) + // + && + // + (!conditions.pvConditions.isLCBearish || + !conditions.pvConditions.isLCHHBearish) + // + && + // + (!conditions.pvConditions.isHCBearish || + !conditions.pvConditions.isHCHHBearish) + // + ) + // + ) + // + || + // + ( + // + ( + // + conditions.pvConditions.isCloseOverFib1 && + conditions.pvConditions.isCloseOverFib2 && + conditions.pvConditions.isCloseOverFib3 && + conditions.pvConditions.isCloseOverFib4 && + conditions.pvConditions.isCloseOverFib5 && + // + !conditions.pvConditions.isNewVale && + !conditions.pvConditions.isNewValeOverLast && + !conditions.pvConditions.isNewValeUnderLast && + !conditions.pvConditions.isFiboIncreased && + !conditions.pvConditions.isFiboDecreased && + !conditions.pvConditions.isFiboSectionChanged && + // + !conditions.pvConditions.isSCBearish && + !conditions.pvConditions.isSCHHBearish && + !conditions.pvConditions.isSCLLBearish && + !conditions.pvConditions.isMCBearish && + !conditions.pvConditions.isMCHHBearish && + !conditions.pvConditions.isMCLLBearish && + !conditions.pvConditions.isLCBearish && + !conditions.pvConditions.isLCHHBearish && + !conditions.pvConditions.isLCLLBearish && + !conditions.pvConditions.isHCBearish && + !conditions.pvConditions.isHCHHBearish && + !conditions.pvConditions.isHCLLBearish + // + ) + // + ) + // + ) + // + || + // + // XCHMA ... + ( + // + conditions.chmaConditions.isFastOverSlow + // + || + // + (!conditions.chmaConditions.isFastOverSlow && + !conditions.chmaConditions.isFastUnderSlow) + // + || + // + ( + // + conditions.chmaConditions.isRetestFastSlow && + conditions.chmaConditions.isRetestCFastSlow && + conditions.chmaConditions.isRetestSFastSlow && + conditions.chmaConditions.isRetestMFastSlow && + conditions.chmaConditions.isRetestLFastSlow && + conditions.chmaConditions.isRetestHFastSlow + // + ) + // + ) + // + ) + // + ; // // Apply Filter ...