From de74cce24549b7128b45237254b68fe172ce0518 Mon Sep 17 00:00:00 2001 From: oblonski Date: Mon, 18 Jul 2016 13:52:53 +0200 Subject: [PATCH] fix bug #259 --- .../jsprit/core/algorithm/PrettyAlgorithmBuilder.java | 3 ++- .../state/UpdateVehicleDependentPracticalTimeWindows.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java index 1d5756e0..8526beec 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java @@ -113,9 +113,10 @@ public class PrettyAlgorithmBuilder { } }); + stateManager.addStateUpdater(new UpdateEndLocationIfRouteIsOpen()); stateManager.addStateUpdater(twUpdater); stateManager.updateSkillStates(); - stateManager.addStateUpdater(new UpdateEndLocationIfRouteIsOpen()); + stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts(), ActivityTimeTracker.ActivityPolicy.AS_SOON_AS_TIME_WINDOW_OPENS, vrp.getActivityCosts())); stateManager.addStateUpdater(new UpdateVariableCosts(vrp.getActivityCosts(), vrp.getTransportCosts(), stateManager)); stateManager.addStateUpdater(new UpdateFutureWaitingTimes(stateManager, vrp.getTransportCosts())); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java index ac67a969..ecd55a4f 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java @@ -89,7 +89,7 @@ public class UpdateVehicleDependentPracticalTimeWindows implements RouteVisitor, vehicles = vehiclesToUpdate.get(route); for (Vehicle vehicle : vehicles) { latest_arrTimes_at_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()] = vehicle.getLatestArrival(); - location_of_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()] = vehicle.getEndLocation(); + location_of_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()] = route.getEnd().getLocation(); } }