diff --git a/Classes/x-saherelm.x121.provider.class.mq5 b/Classes/x-saherelm.x121.provider.class.mq5 index b801430c..7ddba7c8 100644 --- a/Classes/x-saherelm.x121.provider.class.mq5 +++ b/Classes/x-saherelm.x121.provider.class.mq5 @@ -7488,29 +7488,33 @@ private: int pIndex = cIndex + 1; // - // Current Market ... - double cLowerHigh = cMarket.don.GetLowerH(cIndex); bool cHasX786 = cMarket.HasX786LongConditions(); - - // - // Short Market ... - double sLowerHigh = sMarket.don.GetLowerH(cIndex); bool sHasX786 = sMarket.HasX786LongConditions(); - - // - // Medium Market ... - double mLowerHigh = mMarket.don.GetLowerH(cIndex); bool mHasX786 = mMarket.HasX786LongConditions(); - - // - // Long Market ... - double lLowerHigh = lMarket.don.GetLowerH(cIndex); bool lHasX786 = lMarket.HasX786LongConditions(); + bool hHasX786 = hMarket.HasX786LongConditions(); // - // Hind Market ... - double hLowerHigh = hMarket.don.GetLowerH(cIndex); - bool hHasX786 = hMarket.HasX786LongConditions(); + if (cHasX786) + { + sl = cLowerHigh = cMarket.don.GetLowerH(cIndex); + } + else if (sHasX786) + { + sl = sMarket.don.GetLowerH(cIndex); + } + else if (mHasX786) + { + sl = mMarket.don.GetLowerH(cIndex); + } + else if (lHasX786) + { + sl = lMarket.don.GetLowerH(cIndex); + } + else if (hHasX786) + { + sl = hMarket.don.GetLowerH(cIndex); + } // result = @@ -7529,39 +7533,16 @@ private: // lHasX786 // - // || - // // - // hHasX786 + || + // + hHasX786 // ; // if (result) { - // - if (cHasX786) - { - sl = cLowerHigh; - } - else if (sHasX786) - { - sl = sLowerHigh; - } - else if (mHasX786) - { - sl = mLowerHigh; - } - else if (lHasX786) - { - sl = lLowerHigh; - } - else if (hHasX786) - { - sl = hLowerHigh; - } - - // - r2r = 2; + r2r = 1.5; } // @@ -7586,36 +7567,61 @@ private: int pIndex = cIndex + 1; // - bool hasCMarketConditions = cMarket.HasX121LongConditions(); + bool cHasX121 = cMarket.HasX121LongConditions(); + bool sHasX121 = sMarket.HasX121LongConditions(); + bool mHasX121 = mMarket.HasX121LongConditions(); + bool lHasX121 = lMarket.HasX121LongConditions(); + bool hHasX121 = hMarket.HasX121LongConditions(); // - if (hasCMarketConditions) + if (cHasX121) { - // - XOHCL cBar = cMarket.GetBar(cIndex); - - // - r2r = 1.5; - - // sl = cMarket.mrb.GetSlow(cIndex); - // sl = cBar.FindLowest( - // 3, - // MODE_HIGH // - // ); + } + else if (sHasX121) + { + sl = sMarket.mrb.GetSlow(cIndex); + } + else if (mHasX121) + { + sl = mMarket.mrb.GetSlow(cIndex); + } + else if (lHasX121) + { + sl = lMarket.mrb.GetSlow(cIndex); + } + else if (hHasX121) + { + sl = hMarket.mrb.GetSlow(cIndex); } // result = // - hasCMarketConditions + cHasX121 + // + || + // + sHasX121 + // + || + // + mHasX121 + // + || + // + lHasX121 + // + || + // + hHasX121 // ; // if (result) { - Print("Salam"); + r2r = 1.5; } // diff --git a/Classes/x-saherelm.x121.xmcycle.class.mq5 b/Classes/x-saherelm.x121.xmcycle.class.mq5 index aaa77519..b03ac264 100644 --- a/Classes/x-saherelm.x121.xmcycle.class.mq5 +++ b/Classes/x-saherelm.x121.xmcycle.class.mq5 @@ -6050,14 +6050,29 @@ public: isTrendBullish && isMCFastOverSlow && isMRBFastOverSlow)) - // - || - // - (isCHESwitchedToBullish && - (isTrendBullish && + // + || + // + (isCHESwitchedToBullish && + (isTrendBullish && isMCFastOverSlow && isMRBFastOverSlow)) // + || + // + (isTrendSwitchedToBullish && + (isCHEBullish && + isMCFastOverSlow && + isMRBFastOverSlow)) + // + || + // + (isMCFastCrossedOverSlow && + (isCHEBullish && + isTrendBullish && + isMRBFastOverSlow && + isMCSlowOverVerifier)) + // ; //