Voomra/trader
Archived
0
Fork 0
Code Activity

check all vendors if vendor not selected

Browse Source
This commit is contained in:
iMoHax
2015-01-05 01:08:02 +03:00
parent e58dc0d0d4
commit e06ba21b8d
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/ru/trader/core/MarketAnalyzer.java
View File

@@ -187,19 +187,19 @@ public class MarketAnalyzer {
} }
public Collection<PathRoute> getPaths(Place from, Place to, double balance){ public Collection<PathRoute> getPaths(Place from, Place to, double balance){
List<PathRoute> top = new ArrayList<>(limit);
RouteSearcher searcher = new RouteSearcher(maxDistance, tank, segmentSize); RouteSearcher searcher = new RouteSearcher(maxDistance, tank, segmentSize);
Collection<Vendor> vendors = market.getVendors(); Collection<Vendor> vendors = market.getVendors();
Collection<Vendor> fVendors = from.get(); Collection<Vendor> fVendors = from.get();
Collection<Vendor> toVendors = to.get(); Collection<Vendor> toVendors = to.get();
int count = (int) Math.ceil(limit / fVendors.size());
for (Vendor fromVendor : fVendors) { for (Vendor fromVendor : fVendors) {
for (Vendor toVendor : toVendors) { for (Vendor toVendor : toVendors) {
Collection<PathRoute> paths = searcher.getPaths(fromVendor, toVendor, vendors, jumps, balance, cargo, limit); Collection<PathRoute> paths = searcher.getPaths(fromVendor, toVendor, vendors, jumps, balance, cargo, count);
if (paths.size()>0){ TopList.addAllToTop(top, paths, limit, RouteGraph.byProfitComparator);
return paths;
}
} }
} }
return Collections.emptyList(); return top;
} }
public Collection<PathRoute> getPaths(Vendor from, Place to, double balance){ public Collection<PathRoute> getPaths(Vendor from, Place to, double balance){
@@ -207,24 +207,25 @@ public class MarketAnalyzer {
RouteSearcher searcher = new RouteSearcher(maxDistance, tank, segmentSize); RouteSearcher searcher = new RouteSearcher(maxDistance, tank, segmentSize);
Collection<Vendor> vendors = market.getVendors(); Collection<Vendor> vendors = market.getVendors();
Collection<Vendor> toVendors = to.get(); Collection<Vendor> toVendors = to.get();
int count = (int) Math.ceil(limit / toVendors.size());
for (Vendor toVendor : toVendors) { 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); TopList.addAllToTop(top, paths, limit, RouteGraph.byProfitComparator);
} }
return top; return top;
} }
public Collection<PathRoute> getPaths(Place from, Vendor to, double balance){ public Collection<PathRoute> getPaths(Place from, Vendor to, double balance){
List<PathRoute> top = new ArrayList<>(limit);
RouteSearcher searcher = new RouteSearcher(maxDistance, tank, segmentSize); RouteSearcher searcher = new RouteSearcher(maxDistance, tank, segmentSize);
Collection<Vendor> vendors = market.getVendors(); Collection<Vendor> vendors = market.getVendors();
Collection<Vendor> fVendors = from.get(); Collection<Vendor> fVendors = from.get();
int count = (int) Math.ceil(limit / fVendors.size());
for (Vendor fromVendor : fVendors) { for (Vendor fromVendor : fVendors) {
Collection<PathRoute> paths = searcher.getPaths(fromVendor, to, vendors, jumps, balance, cargo, limit); Collection<PathRoute> paths = searcher.getPaths(fromVendor, to, vendors, jumps, balance, cargo, count);
if (paths.size()>0){ TopList.addAllToTop(top, paths, limit, RouteGraph.byProfitComparator);
return paths;
}
} }
return Collections.emptyList(); return top;
} }
public Collection<PathRoute> getTopPaths(double balance){ public Collection<PathRoute> getTopPaths(double balance){