From e06ba21b8dd8cf15236773b2cf7a721f743e624b Mon Sep 17 00:00:00 2001
From: iMoHax <monah357@mail.ru>
Date: Mon, 5 Jan 2015 01:08:02 +0300
Subject: [PATCH] check all vendors if vendor not selected

---
 .../java/ru/trader/core/MarketAnalyzer.java   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/ru/trader/core/MarketAnalyzer.java b/core/src/main/java/ru/trader/core/MarketAnalyzer.java
index 89547d8..81e7007 100644
--- a/core/src/main/java/ru/trader/core/MarketAnalyzer.java
+++ b/core/src/main/java/ru/trader/core/MarketAnalyzer.java
@@ -187,19 +187,19 @@ public class MarketAnalyzer {
     }
 
     public Collection<PathRoute> getPaths(Place from, Place to, double balance){
+        List<PathRoute> top = new ArrayList<>(limit);
         RouteSearcher searcher = new RouteSearcher(maxDistance, tank, segmentSize);
         Collection<Vendor> vendors = market.getVendors();
         Collection<Vendor> fVendors = from.get();
         Collection<Vendor> toVendors = to.get();
+        int count = (int) Math.ceil(limit / fVendors.size());
         for (Vendor fromVendor : fVendors) {
             for (Vendor toVendor : toVendors) {
-                Collection<PathRoute> paths = searcher.getPaths(fromVendor, toVendor, vendors, jumps, balance, cargo, limit);
-                if (paths.size()>0){
-                    return paths;
-                }
+                Collection<PathRoute> paths = searcher.getPaths(fromVendor, toVendor, vendors, jumps, balance, cargo, count);
+                TopList.addAllToTop(top, paths, limit, RouteGraph.byProfitComparator);
             }
         }
-        return Collections.emptyList();
+        return top;
     }
 
     public Collection<PathRoute> getPaths(Vendor from, Place to, double balance){
@@ -207,24 +207,25 @@ public class MarketAnalyzer {
         RouteSearcher searcher = new RouteSearcher(maxDistance, tank, segmentSize);
         Collection<Vendor> vendors = market.getVendors();
         Collection<Vendor> toVendors = to.get();
+        int count = (int) Math.ceil(limit / toVendors.size());
         for (Vendor toVendor : toVendors) {
-            Collection<PathRoute> paths = searcher.getPaths(from, toVendor, vendors, jumps, balance, cargo, limit);
+            Collection<PathRoute> paths = searcher.getPaths(from, toVendor, vendors, jumps, balance, cargo, count);
             TopList.addAllToTop(top, paths, limit, RouteGraph.byProfitComparator);
         }
         return top;
     }
 
     public Collection<PathRoute> getPaths(Place from, Vendor to, double balance){
+        List<PathRoute> top = new ArrayList<>(limit);
         RouteSearcher searcher = new RouteSearcher(maxDistance, tank, segmentSize);
         Collection<Vendor> vendors = market.getVendors();
         Collection<Vendor> fVendors = from.get();
+        int count = (int) Math.ceil(limit / fVendors.size());
         for (Vendor fromVendor : fVendors) {
-            Collection<PathRoute> paths = searcher.getPaths(fromVendor, to, vendors, jumps, balance, cargo, limit);
-            if (paths.size()>0){
-                return paths;
-            }
+            Collection<PathRoute> paths = searcher.getPaths(fromVendor, to, vendors, jumps, balance, cargo, count);
+            TopList.addAllToTop(top, paths, limit, RouteGraph.byProfitComparator);
         }
-        return Collections.emptyList();
+        return top;
     }
 
     public Collection<PathRoute> getTopPaths(double balance){