Voomra/trader
Archived
0
Fork 0
Code Activity

fix to route if is one edge

Browse Source
This commit is contained in:
iMoHax
2015-11-09 16:43:10 +03:00
parent 073fabf52c
commit 108ca28475
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/ru/trader/analysis/RouteSearcher.java
View File

@@ -221,21 +221,20 @@ public class RouteSearcher {
ConnectibleEdge<Place> edge = (ConnectibleEdge<Place>) edges.get(i); ConnectibleEdge<Place> edge = (ConnectibleEdge<Place>) edges.get(i);
Vendor vendor = i == 0 ? from : edge.getSource().getEntry().asTransit(); Vendor vendor = i == 0 ? from : edge.getSource().getEntry().asTransit();
RouteEntry entry = new RouteEntry(vendor, edge.getRefill(), edge.getFuelCost(), 0); RouteEntry entry = new RouteEntry(vendor, edge.getRefill(), edge.getFuelCost(), 0);
if (i == 0) entry.setLand(!(vendor instanceof TransitVendor));
if (prev != null){ if (prev != null){
prev.setTime(scorer.getTime(entry, prev)); prev.setTime(scorer.getTime(entry, prev));
prev.setFullTime(prev.getTime()); prev.setFullTime(prev.getTime());
} }
entries.add(entry); entries.add(entry);
prev = entry;
if (i == edges.size()-1){ if (i == edges.size()-1){
entry = new RouteEntry(to, 0, 0, 0); entry = new RouteEntry(to, 0, 0, 0);
entry.setLand(true); entry.setLand(!(to instanceof TransitVendor));
if (prev != null){
prev.setTime(scorer.getTime(entry, prev)); prev.setTime(scorer.getTime(entry, prev));
prev.setFullTime(prev.getTime()); prev.setFullTime(prev.getTime());
}
entries.add(entry); entries.add(entry);
} }
prev = entry;
} }
Route route = new Route(entries); Route route = new Route(entries);
route.setBalance(scorer.getProfile().getBalance()); route.setBalance(scorer.getProfile().getBalance());