diff --git a/Classes/x-saherelm.x5.provider.class.mq5 b/Classes/x-saherelm.x5.provider.class.mq5 index a47d9651..23890583 100644 --- a/Classes/x-saherelm.x5.provider.class.mq5 +++ b/Classes/x-saherelm.x5.provider.class.mq5 @@ -941,31 +941,49 @@ public: // if (isXLHHHIncreased) { + // + bullScore--; + bearScore++; } // if (isXLHHHDecreased) { + // + bullScore++; + bearScore--; } // if (isXLHLLIncreased) { + // + bullScore++; + bearScore--; } // if (isXLHLLDecreased) { + // + bullScore--; + bearScore++; } // if (isXLHLowAttachedLL) { + // + bullScore++; + bearScore--; } // if (isXLHHighAttachedHH) { + // + bullScore--; + bearScore++; } // @@ -981,11 +999,13 @@ public: // if (isXLHPriceOverSignal) { + bullScore++; } // if (isXLHPriceUnderSignal) { + bearScore++; } // @@ -996,11 +1016,17 @@ public: // if (isXLHPriceCrossedOverSignal) { + // + bullScore++; + bearScore--; } // if (isXLHPriceCrossedUnderSignal) { + // + bullScore--; + bearScore++; } // @@ -1057,41 +1083,57 @@ public: // if (isXTDBullOverBear) { + bullScore++; } // if (isXTDBullUnderBear) { + bearScore++; } // if (isXTDSignalOverBear) { + bullScore++; } // if (isXTDSignalUnderBear) { + bearScore++; } // if (isXTDBullCrossedOverBear) { + // + bullScore++; + bearScore--; } // if (isXTDBullCrossedUnderBear) { + // + bullScore--; + bearScore++; } // if (isXTDSignalCrossedOverBear) { + // + bullScore++; + bearScore--; } // if (isXTDSignalCrossedUnderBear) { + // + bullScore--; + bearScore++; } // @@ -1116,21 +1158,29 @@ public: // if (isXFICrossedOverZero) { + // + bullScore++; + bearScore--; } // if (isXFIOverZero) { + bullScore++; } // if (isXFICrossedUnderZero) { + // + bullScore--; + bearScore++; } // if (isXFIUnderZero) { + bearScore++; } // @@ -1144,71 +1194,101 @@ public: // if (isXTSCurrentMin) { + // + bullScore++; + bearScore--; } // if (isXTSCurrentMax) { + // + bullScore--; + bearScore++; } // if (isXTSCurrentOverFarest) { + bullScore--; } // if (isXTSCurrentOverNearest) { + bullScore--; } // if (isXTSCurrentOverMediest) { + bullScore--; } // if (isXTSCurrentUnderFarest) { + bearScore--; } // if (isXTSCurrentUnderNearest) { + bearScore--; } // if (isXTSCurrentUnderMediest) { + bearScore--; } // if (isXTSCurrentCrossedOverFarest) { + // + bullScore++; + bearScore--; } // if (isXTSCurrentCrossedOverNearest) { + // + bullScore++; + bearScore--; } // if (isXTSCurrentCrossedOverMediest) { + // + bullScore++; + bearScore--; } // if (isXTSCurrentCrossedUnderFarest) { + // + bullScore--; + bearScore++; } // if (isXTSCurrentCrossedUnderNearest) { + // + bullScore--; + bearScore++; } // if (isXTSCurrentCrossedUnderMediest) { + // + bullScore--; + bearScore++; } // @@ -1233,21 +1313,33 @@ public: // if (isXRSICrossedOverLongExit) { + // + bullScore--; + bearScore++; } // if (isXRSICrossedOverLongEntry) { + // + bullScore++; + bearScore--; } // if (isXRSICrossedUnderShortExit) { + // + bullScore++; + bearScore--; } // if (isXRSICrossedUnderShortEntry) { + // + bullScore--; + bearScore++; } // @@ -1256,11 +1348,13 @@ public: // if (isXOBDSwingLow) { + bullScore++; } // if (isXOBDSwingHigh) { + bearScore++; } // @@ -1269,41 +1363,49 @@ public: // if (isXCHLHSameHHs) { + bearScore++; } // if (isXCHLHSameLLs) { + bullScore++; } // if (isXCHLHSCMCHHSame) { + bearScore++; } // if (isXCHLHSCMCLLSame) { + bullScore++; } // if (isXCHLHSCLCHHSame) { + bearScore++; } // if (isXCHLHSCLCLLSame) { + bullScore++; } // if (isXCHLHMCLCHHSame) { + bearScore++; } // if (isXCHLHMCLCLLSame) { + bullScore++; } // @@ -1322,41 +1424,65 @@ public: // if (isXCHMASCOverMax) { + // + bullScore--; + bearScore++; } // if (isXCHMASCOverMin) { + // + bullScore++; + bearScore--; } // if (isXCHMASCUnderMax) { + // + bullScore--; + bearScore++; } // if (isXCHMASCUnderMin) { + // + bullScore++; + bearScore--; } // if (isXCHMASCCrossedOverMax) { + // + bearScore--; + bearScore++; } // if (isXCHMASCCrossedUnderMax) { + // + bullScore--; + bearScore++; } // if (isXCHMASCCrossedOverMin) { + // + bullScore++; + bearScore--; } // if (isXCHMASCCrossedUnderMin) { + // + bullScore++; + bearScore--; } // @@ -1378,31 +1504,69 @@ public: // if (isXCHMASCTrendsUp) { + // + if (isXCHMASCFastOverSlow) + { + // + bullScore++; + bearScore--; + } + + // + if (isXCHMASCFastUnderSlow) + { + // + bullScore--; + bearScore++; + } } // if (isXCHMASCTrendsDown) { + // + if (isXCHMASCFastOverSlow) + { + // + bullScore--; + bearScore++; + } + + // + if (isXCHMASCFastUnderSlow) + { + // + bullScore++; + bearScore--; + } } // if (isXCHMASCFastOverSlow) { + bearScore++; } // if (isXCHMASCFastUnderSlow) { + bearScore++; } // if (isXCHMASCFastCrossedOverSlow) { + // + bullScore++; + bearScore--; } // if (isXCHMASCFastCrossedUnderSlow) { + // + bullScore--; + bearScore++; } // @@ -1424,31 +1588,69 @@ public: // if (isXCHMAMCTrendsUp) { + // + if (isXCHMAMCFastOverSlow) + { + // + bullScore++; + bearScore--; + } + + // + if (isXCHMAMCFastUnderSlow) + { + // + bullScore--; + bearScore++; + } } // if (isXCHMAMCTrendsDown) { + // + if (isXCHMAMCFastOverSlow) + { + // + bullScore--; + bearScore++; + } + + // + if (isXCHMAMCFastUnderSlow) + { + // + bullScore++; + bearScore--; + } } // if (isXCHMAMCFastOverSlow) { + bullScore++; } // if (isXCHMAMCFastUnderSlow) { + bearScore++; } // if (isXCHMAMCFastCrossedOverSlow) { + // + bullScore++; + bearScore--; } // if (isXCHMAMCFastCrossedUnderSlow) { + // + bullScore--; + bearScore++; } // @@ -1470,31 +1672,69 @@ public: // if (isXCHMALCTrendsUp) { + // + if (isXCHMALCFastOverSlow) + { + // + bullScore++; + bearScore--; + } + + // + if (isXCHMALCFastUnderSlow) + { + // + bullScore--; + bearScore++; + } } // if (isXCHMALCTrendsDown) { + // + if (isXCHMALCFastOverSlow) + { + // + bullScore--; + bearScore++; + } + + // + if (isXCHMALCFastUnderSlow) + { + // + bullScore++; + bearScore--; + } } // if (isXCHMALCFastOverSlow) { + bullScore++; } // if (isXCHMALCFastUnderSlow) { + bearScore++; } // if (isXCHMALCFastCrossedOverSlow) { + // + bullScore++; + bearScore--; } // if (isXCHMALCFastCrossedUnderSlow) { + // + bullScore--; + bearScore++; } //