From 1f43571e37047080b7c11606035f4fd4e0d213d5 Mon Sep 17 00:00:00 2001
From: iMoHax <born19th@gmail.com>
Date: Mon, 14 Dec 2015 14:25:37 +0300
Subject: [PATCH] fix reserves for not looped routes

---
 core/src/main/java/ru/trader/analysis/Route.java      |  3 ++-
 .../src/main/java/ru/trader/analysis/RouteFiller.java | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/ru/trader/analysis/Route.java b/core/src/main/java/ru/trader/analysis/Route.java
index 235fcf0..173067e 100644
--- a/core/src/main/java/ru/trader/analysis/Route.java
+++ b/core/src/main/java/ru/trader/analysis/Route.java
@@ -308,6 +308,7 @@ public class Route implements Comparable<Route> {
     public LoopIterator loopIterator(int from){
         return new LoopIterator() {
             private final int size = entries.size() - (isLoop() ? 1 : 0);
+            private final int maxIndex = isLoop() ? size - 1 : size - from;
             private int i = -1;
 
             @Override
@@ -324,7 +325,7 @@ public class Route implements Comparable<Route> {
 
             @Override
             public boolean hasNext() {
-                return i < size-1;
+                return i < maxIndex;
             }
 
             @Override
diff --git a/core/src/main/java/ru/trader/analysis/RouteFiller.java b/core/src/main/java/ru/trader/analysis/RouteFiller.java
index 60ae6e3..d7a5edc 100644
--- a/core/src/main/java/ru/trader/analysis/RouteFiller.java
+++ b/core/src/main/java/ru/trader/analysis/RouteFiller.java
@@ -421,11 +421,14 @@ public class RouteFiller {
         return res;
     }
 
-    private static int getLastIndex(final int fromIndex, final Offer buyOffer, final Order[] sells){
+    private static int getLastIndex(final int fromIndex, final Offer buyOffer, final Order[] sells, boolean isLoop){
         long need = buyOffer.getCount();
         for (int i = 0; i < sells.length; i++) {
             int index = i + fromIndex;
-            if (index >= sells.length) index -= sells.length;
+            if (index >= sells.length){
+                if (isLoop) index -= sells.length;
+                    else break;
+            }
             Order sell = sells[index];
             if (sell == null) continue;
             if (sell.getCount() >= need) {
@@ -465,7 +468,7 @@ public class RouteFiller {
                 this.entry = entry;
                 this.index = index;
                 this.sell = orders[index];
-                int lastIndex = getLastIndex(index, buyOffer, orders);
+                int lastIndex = getLastIndex(index, buyOffer, orders, route.isLoop());
                 if (lastIndex != -1) {
                     endIndex = route.find(buyOffer.getVendor(), lastIndex+1);
                     if (endIndex != -1) {
@@ -481,7 +484,7 @@ public class RouteFiller {
             }
 
             private boolean isSeller(){
-                return sell != null && endIndex != -1;
+                return sell != null && endIndex != -1 && (endIndex >= index || route.isLoop());
             }
 
             private double getProfit(){