From 108ca2847564a87d25a9144fa87c654ef41e5fe2 Mon Sep 17 00:00:00 2001 From: iMoHax Date: Mon, 9 Nov 2015 16:43:10 +0300 Subject: [PATCH] fix to route if is one edge --- .../main/java/ru/trader/analysis/RouteSearcher.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/ru/trader/analysis/RouteSearcher.java b/core/src/main/java/ru/trader/analysis/RouteSearcher.java index 37ce9a5..82ae54b 100644 --- a/core/src/main/java/ru/trader/analysis/RouteSearcher.java +++ b/core/src/main/java/ru/trader/analysis/RouteSearcher.java @@ -221,21 +221,20 @@ public class RouteSearcher { ConnectibleEdge edge = (ConnectibleEdge) edges.get(i); Vendor vendor = i == 0 ? from : edge.getSource().getEntry().asTransit(); RouteEntry entry = new RouteEntry(vendor, edge.getRefill(), edge.getFuelCost(), 0); + if (i == 0) entry.setLand(!(vendor instanceof TransitVendor)); if (prev != null){ prev.setTime(scorer.getTime(entry, prev)); prev.setFullTime(prev.getTime()); } entries.add(entry); + prev = entry; if (i == edges.size()-1){ entry = new RouteEntry(to, 0, 0, 0); - entry.setLand(true); - if (prev != null){ - prev.setTime(scorer.getTime(entry, prev)); - prev.setFullTime(prev.getTime()); - } + entry.setLand(!(to instanceof TransitVendor)); + prev.setTime(scorer.getTime(entry, prev)); + prev.setFullTime(prev.getTime()); entries.add(entry); } - prev = entry; } Route route = new Route(entries); route.setBalance(scorer.getProfile().getBalance());