diff --git a/Classes/x-saherelm.x121.setup.class.mq5 b/Classes/x-saherelm.x121.setup.class.mq5 index 3c7b00a1..39f0bdea 100644 --- a/Classes/x-saherelm.x121.setup.class.mq5 +++ b/Classes/x-saherelm.x121.setup.class.mq5 @@ -2051,6 +2051,15 @@ struct X121SignalGenerator // bool result = false; + // + // Generating Conditions Score ... + double bullishScore = 0; + double bearishScore = 0; + conditions.GenerateScore( + bullishScore, + bearishScore // + ); + // bool isGBPUSD = symbolParser.IsGBPUSD(conditions.symbol); @@ -2159,6 +2168,60 @@ 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 + // + ) + // + && + // + ( + // + // XSCORES ... + bearishScore < 5 && + bullishScore > bearishScore * 10 + // + ) + // + && + // + ( + // + ( + // + // XPV ... + conditions.pvConditions.isSCBullish && + conditions.pvConditions.isSCHHBullish && + conditions.pvConditions.isSCLLBullish && + conditions.pvConditions.isMCBullish && + conditions.pvConditions.isMCHHBullish && + conditions.pvConditions.isMCLLBullish && + conditions.pvConditions.isLCBullish && + conditions.pvConditions.isLCHHBullish && + conditions.pvConditions.isLCLLBullish && + conditions.pvConditions.isHCBullish && + conditions.pvConditions.isHCHHBullish && + conditions.pvConditions.isHCLLBullish + // + ) + // + ) + // + ) + // ) // ; @@ -3410,6 +3473,15 @@ struct X121SignalGenerator // bool result = false; + // + // Generating Conditions Score ... + double bullishScore = 0; + double bearishScore = 0; + conditions.GenerateScore( + bullishScore, + bearishScore // + ); + // bool isGBPUSD = symbolParser.IsGBPUSD(conditions.symbol); @@ -3495,6 +3567,82 @@ struct X121SignalGenerator // ) // + || + // + ( + // + ( + // + // 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 + // + ) // + && + // + ( + // + // XVLM ... + conditions.vlmConditions.isVolumeBearish && + conditions.vlmConditions.isVolumeOverLast + // + ) + // + && + // + ( + // + ( + // + 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 && + // + // XICH ... + conditions.ichConditions.isClosedUnderKijunSen && + conditions.ichConditions.isTenkanSenUnderKijunSen && + conditions.ichConditions.isSenkouSpanAUnderB && + conditions.ichConditions.isSenkouSpanAUnderLast && + conditions.ichConditions.isFutureSenkouSpanAUnderB && + conditions.ichConditions.isFutureSenkouSpanAUnderLast && + conditions.ichConditions.isSenkouSpanACrossedUnderLast + // + ) + // + || + // + ( + // + // XICH ... + conditions.ichConditions.isSenkouSpanACrossedUnderB + // + ) + // + ) + // + && + // + // XSCORES ... + bullishScore < 5 && + bearishScore > bullishScore * 10 + // + ) + // ) // ;