diff --git a/Classes/x-saherelm.x121.setup.class.mq5 b/Classes/x-saherelm.x121.setup.class.mq5 index b6bf6099..c3c0744c 100644 --- a/Classes/x-saherelm.x121.setup.class.mq5 +++ b/Classes/x-saherelm.x121.setup.class.mq5 @@ -2099,7 +2099,7 @@ struct X121SignalGenerator result = true; // - result = + result = // result && !( @@ -2110,7 +2110,7 @@ struct X121SignalGenerator bearishScore < 5 && bullishScore > bearishScore * 10 // - ) + ) // || // @@ -2121,9 +2121,9 @@ struct X121SignalGenerator // conditions.mrbConditions.isFastUnderSlow // - ) + ) // - ) + ) // || // @@ -2132,12 +2132,17 @@ struct X121SignalGenerator // ( // - conditions.mcConditions.isFastUnderSlow || - conditions.mcConditions.isFastUnderVerifier + (conditions.mcConditions.isFastUnderSlow || + conditions.mcConditions.isFastUnderVerifier) // - ) + || + // + (!conditions.mcConditions.isSARBullish && + !conditions.mcConditions.isSARBearish) + // + ) // - ) + ) // || // @@ -2145,9 +2150,11 @@ struct X121SignalGenerator ( // ( + // conditions.ichConditions.isClosedUnderKijunSen && conditions.ichConditions.isTenkanSenOverKijunSen - ) + // + ) // || // @@ -2166,10 +2173,10 @@ struct X121SignalGenerator !conditions.ichConditions.isTenkanSenOverKijunSen // ) - // - || - // - ( + // + || + // + ( // conditions.ichConditions.isSenkouSpanAUnderB || conditions.ichConditions.isSenkouSpanAUnderLast || @@ -2177,7 +2184,44 @@ 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.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 && + // + ) + // + ) + // + ) // || // @@ -2187,98 +2231,98 @@ struct X121SignalGenerator ( // (!conditions.chmaConditions.isFastOverSlow && - conditions.chmaConditions.isFastUnderSlow) + conditions.chmaConditions.isFastUnderSlow) // && // + ( + // + ( + // + conditions.chmaConditions.isCFastUnderSlow && + conditions.chmaConditions.isSFastUnderSlow + // + ) + // + || + // + ( + // + conditions.chmaConditions.isSFastUnderSlow && + conditions.chmaConditions.isMFastUnderSlow + // + ) + // + || + // + ( + // + conditions.chmaConditions.isMFastUnderSlow && + conditions.chmaConditions.isLFastUnderSlow + // + ) + // + || + // + ( + // + conditions.chmaConditions.isLFastUnderSlow && + conditions.chmaConditions.isHFastUnderSlow + // + ) + // + || + ( + // + conditions.chmaConditions.isCFastUnderSlow && + conditions.chmaConditions.isSFastUnderSlow && + conditions.chmaConditions.isMFastUnderSlow + // + ) + // + || + // + ( + // + conditions.chmaConditions.isCFastUnderSlow && + conditions.chmaConditions.isSFastUnderSlow && + conditions.chmaConditions.isMFastUnderSlow && + conditions.chmaConditions.isLFastUnderSlow + // + ) + // + || + // + ( + // + conditions.chmaConditions.isCFastUnderSlow && + conditions.chmaConditions.isSFastUnderSlow && + conditions.chmaConditions.isMFastUnderSlow && + conditions.chmaConditions.isLFastUnderSlow && + conditions.chmaConditions.isHFastUnderSlow + // + ) + // + ) + // + ) + // + || + // ( // - ( - // - conditions.chmaConditions.isCFastUnderSlow || - conditions.chmaConditions.isSFastUnderSlow - // - ) + conditions.chmaConditions.isRetestFastSlow && + conditions.chmaConditions.isRetestCFastSlow && + conditions.chmaConditions.isRetestSFastSlow && + conditions.chmaConditions.isRetestMFastSlow && + conditions.chmaConditions.isRetestLFastSlow && + conditions.chmaConditions.isRetestHFastSlow // - || - // - ( - // - conditions.chmaConditions.isSFastUnderSlow || - conditions.chmaConditions.isMFastUnderSlow - // - ) - // - || - // - ( - // - conditions.chmaConditions.isMFastUnderSlow || - conditions.chmaConditions.isLFastUnderSlow - // - ) - // - || - // - ( - // - conditions.chmaConditions.isLFastUnderSlow || - conditions.chmaConditions.isHFastUnderSlow - // - ) - // - || - ( - // - conditions.chmaConditions.isCFastUnderSlow || - conditions.chmaConditions.isSFastUnderSlow || - conditions.chmaConditions.isMFastUnderSlow - // ) // - || - // - ( - // - conditions.chmaConditions.isCFastUnderSlow || - conditions.chmaConditions.isSFastUnderSlow || - conditions.chmaConditions.isMFastUnderSlow || - conditions.chmaConditions.isLFastUnderSlow - // - ) - // - || - // - ( - // - conditions.chmaConditions.isCFastUnderSlow || - conditions.chmaConditions.isSFastUnderSlow || - conditions.chmaConditions.isMFastUnderSlow || - conditions.chmaConditions.isLFastUnderSlow || - conditions.chmaConditions.isHFastUnderSlow - // - ) - // ) - // - ) - // - || - // - ( - // - conditions.chmaConditions.isRetestFastSlow && - conditions.chmaConditions.isRetestCFastSlow && - conditions.chmaConditions.isRetestSFastSlow && - conditions.chmaConditions.isRetestMFastSlow && - conditions.chmaConditions.isRetestLFastSlow && - conditions.chmaConditions.isRetestHFastSlow - // - ) - // - ) // - ) + ) // ; @@ -3552,7 +3596,7 @@ struct X121SignalGenerator result = true; // // - // result = + // result = // // // result && // !(