diff --git a/Classes/x-saherelm.x121.setup.class.mq5 b/Classes/x-saherelm.x121.setup.class.mq5 index 57b72d5d..44bffc49 100644 --- a/Classes/x-saherelm.x121.setup.class.mq5 +++ b/Classes/x-saherelm.x121.setup.class.mq5 @@ -2103,6 +2103,15 @@ struct X121SignalGenerator // result && !( + // + // XRL ... + ( + // + (conditions.rlConditions.isFastBearish) + // + ) + // + || // // XMRB ... ( @@ -2174,6 +2183,34 @@ struct X121SignalGenerator // ) // + || + // + ( + // + (!conditions.ichConditions.isTenkanSenOverKijunSen && + !conditions.ichConditions.isTenkanSenUnderKijunSen) && + (((conditions.ichConditions.isClosedUnderKijunSen && + conditions.ichConditions.isSenkouSpanAOverB) && + ( + // + ( + (conditions.ichConditions.isFutureSenkouSpanAOverB && + conditions.ichConditions.isFutureSenkouSpanAOverLast) && + (conditions.ichConditions.isFutureSenkouSpanACrossedOverLast + // + || + // + (conditions.ichConditions.isSenkouSpanAOverLast && + conditions.ichConditions.isSenkouSpanACrossedOverLast) + // + ) + // + ) + // + ))) + // + ) + // ) // || @@ -2335,6 +2372,27 @@ struct X121SignalGenerator // ) // + || + // + ( + // + conditions.chmaConditions.isFastSupport && + conditions.chmaConditions.isSlowSupport && + conditions.chmaConditions.isFastOverSlow && + conditions.chmaConditions.isCLoseOverFast && + conditions.chmaConditions.isCloseOverSlow && + conditions.chmaConditions.isRetestFastSlow && + ( + // + (!conditions.chmaConditions.isBreakedFastAsSupport && + !conditions.chmaConditions.isBreakedSlowAsSupport && + !conditions.chmaConditions.isRejectedFastAsSupport && + !conditions.chmaConditions.isRejectedSlowAsSupport) + // + ) + // + ) + // ) // )