last ...

Classes/x-saherelm.x-bar.analyser.class.mq5

@@ -260,7 +260,7 @@ class XCBarAnalyser : public XCBase
         }
 
         //
-        index = bar.Index();
+        index = bar.Index() + 1;
         bool canContinue = true;
         int sameBullishBarsFounded = 0;
         int sameBearishBarsFounded = 0;
@@ -297,12 +297,20 @@ class XCBarAnalyser : public XCBase
                 sameBullishBarsFounded++;
                 canContinueForBearish = false;
             }
-            else
+            else if (isBearish)
             {
                 //
                 sameBearishBarsFounded++;
                 canContinueForBullish = false;
             }
+            else
+            {
+                //
+                sameBullishBarsFounded = 0;
+                sameBearishBarsFounded = 0;
+                canContinueForBullish = false;
+                canContinueForBearish = false;
+            }
 
             //
             result = canContinueForBullish ||
@@ -348,6 +356,9 @@ class XCBarAnalyser : public XCBase
             return result;
         }
 
+        //
+        index--;
+
         //
         dir =
             hasBullishSameBars
@@ -2295,7 +2306,7 @@ class XCBarAnalyser : public XCBase
         }
 
         //
-        int obIndex = index;
+        int obIndex = index + 1;
         result = ob.Init(
             bar.symbol,
             bar.period,
@@ -2368,8 +2379,11 @@ class XCBarAnalyser : public XCBase
         bool isBullish = IsBullish(dir);
 
         //
-        int to = bar.Index() + 1;
-        int from = index + 1;
+        int to = bar.Index();
+        int from =
+            index > (to + sameBars)
+                ? to + sameBars
+                : index;
         for (int i = from; i > to; i--)
         {
             //