diff --git a/Classes/x-saherelm.x121.setup.class.mq5 b/Classes/x-saherelm.x121.setup.class.mq5 index 0a29db55..b6bf6099 100644 --- a/Classes/x-saherelm.x121.setup.class.mq5 +++ b/Classes/x-saherelm.x121.setup.class.mq5 @@ -2098,6 +2098,190 @@ struct X121SignalGenerator // Set Default Result to True ... result = true; + // + result = + // + result && + !( + // + // XSCORES ... + ( + // + bearishScore < 5 && + bullishScore > bearishScore * 10 + // + ) + // + || + // + // XMRB ... + ( + // + ( + // + conditions.mrbConditions.isFastUnderSlow + // + ) + // + ) + // + || + // + // XCM ... + ( + // + ( + // + conditions.mcConditions.isFastUnderSlow || + conditions.mcConditions.isFastUnderVerifier + // + ) + // + ) + // + || + // + // XICH ... + ( + // + ( + conditions.ichConditions.isClosedUnderKijunSen && + conditions.ichConditions.isTenkanSenOverKijunSen + ) + // + || + // + ( + // + !conditions.ichConditions.isClosedOverKijunSen && + conditions.ichConditions.isTenkanSenOverKijunSen + // + ) + // + || + // + ( + // + conditions.ichConditions.isClosedOverKijunSen && + !conditions.ichConditions.isTenkanSenOverKijunSen + // + ) + // + || + // + ( + // + conditions.ichConditions.isSenkouSpanAUnderB || + conditions.ichConditions.isSenkouSpanAUnderLast || + conditions.ichConditions.isFutureSenkouSpanAUnderB + // + ) + // + ) + // + || + // + // XCHMA ... + ( + // + ( + // + (!conditions.chmaConditions.isFastOverSlow && + 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.isRetestFastSlow && + conditions.chmaConditions.isRetestCFastSlow && + conditions.chmaConditions.isRetestSFastSlow && + conditions.chmaConditions.isRetestMFastSlow && + conditions.chmaConditions.isRetestLFastSlow && + conditions.chmaConditions.isRetestHFastSlow + // + ) + // + ) + // + ) + // + ; + // // Apply Filter ... // Based On Symbol and Period ... @@ -3367,6 +3551,17 @@ struct X121SignalGenerator // Set Default Result to True ... result = true; + // // + // result = + // // + // result && + // !( + // // + // // + // ) + // // + // ; + // // Apply Filter ... // Based On Symbol and Period ... diff --git a/Documents/long filters.mq5 b/Documents/long filters.mq5 new file mode 100644 index 00000000..cd174f07 --- /dev/null +++ b/Documents/long filters.mq5 @@ -0,0 +1,163 @@ +// +// XSCORES ... +( + // + bearishScore < 5 && + bullishScore > bearishScore * 10 + // +) + + // + // XICH ... + ( + // + ( + // + !conditions.ichConditions.isClosedOverKijunSen && + conditions.ichConditions.isTenkanSenOverKijunSen + // + ) + // + || + // + ( + // + conditions.ichConditions.isClosedOverKijunSen && + !conditions.ichConditions.isTenkanSenOverKijunSen + // + ) + // + || + // + ( +// +conditions.ichConditions.isSenkouSpanAUnderB || +conditions.ichConditions.isSenkouSpanAUnderLast || +conditions.ichConditions.isFutureSenkouSpanAUnderB +// + ) + // + ) + + // + // XCHMA ... + ( + // + ( + // +(!conditions.chmaConditions.isFastOverSlow && +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.isRetestFastSlow && + conditions.chmaConditions.isRetestCFastSlow && + conditions.chmaConditions.isRetestSFastSlow && + conditions.chmaConditions.isRetestMFastSlow && + conditions.chmaConditions.isRetestLFastSlow && + conditions.chmaConditions.isRetestHFastSlow + // + ) + // + ) + + // + // XCM ... + ( + // + ( + // +conditions.mcConditions.isFastUnderSlow || +conditions.mcConditions.isFastUnderVerifier + // + ) + // + ) + + // + // XMRB ... + ( + // + ( + // +conditions.mrbConditions.isFastUnderSlow + // + ) + // + ) \ No newline at end of file diff --git a/Libraries/x-saherelm.common.lib.mq5 b/Libraries/x-saherelm.common.lib.mq5 index 2834b247..8af00dfc 100644 --- a/Libraries/x-saherelm.common.lib.mq5 +++ b/Libraries/x-saherelm.common.lib.mq5 @@ -1964,14 +1964,14 @@ struct XBarTracker bool CanProcessBar() { // - bool isInTestMode = IsRunningOnTestMode(); + bool _isInTestMode = IsRunningOnTestMode(); // bool isNewBar = IsNewBar(); // bool result = - isInTestMode + _isInTestMode ? isNewBar : !waitsUntilNext ? true