From 71a3cbe9a89a0e1f3311a3b5017f7abc1066f1cf Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Wed, 13 Nov 2013 06:13:52 +0100 Subject: [PATCH] fix defaultState --- jsprit-core/src/main/java/algorithms/RemoveEmptyVehicles.java | 2 +- jsprit-core/src/main/java/algorithms/StateManager.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jsprit-core/src/main/java/algorithms/RemoveEmptyVehicles.java b/jsprit-core/src/main/java/algorithms/RemoveEmptyVehicles.java index 28919048..587020bd 100644 --- a/jsprit-core/src/main/java/algorithms/RemoveEmptyVehicles.java +++ b/jsprit-core/src/main/java/algorithms/RemoveEmptyVehicles.java @@ -26,7 +26,7 @@ import basics.algo.InsertionEndsListener; import basics.route.VehicleFleetManager; import basics.route.VehicleRoute; -class RemoveEmptyVehicles implements InsertionEndsListener{ +public class RemoveEmptyVehicles implements InsertionEndsListener{ private static Logger log = Logger.getLogger(RemoveEmptyVehicles.class); diff --git a/jsprit-core/src/main/java/algorithms/StateManager.java b/jsprit-core/src/main/java/algorithms/StateManager.java index e83241b8..8f259060 100644 --- a/jsprit-core/src/main/java/algorithms/StateManager.java +++ b/jsprit-core/src/main/java/algorithms/StateManager.java @@ -232,6 +232,7 @@ public class StateManager implements StateGetter, IterationStartsListener, RuinL if(stateId.equals(StateFactory.LATEST_OPERATION_START_TIME)) return new StateImpl(act.getTheoreticalLatestOperationStartTime()); if(stateId.equals(StateFactory.FUTURE_PICKS)) return new StateImpl(0); if(stateId.equals(StateFactory.PAST_DELIVERIES)) return new StateImpl(0); + if(defaultActivityStates.containsKey(stateId)) return defaultActivityStates.get(stateId); return null; } @@ -242,6 +243,7 @@ public class StateManager implements StateGetter, IterationStartsListener, RuinL if(stateId.equals(StateFactory.LOAD_AT_BEGINNING)) return new StateImpl(0); if(stateId.equals(StateFactory.COSTS)) return new StateImpl(0); if(stateId.equals(StateFactory.DURATION)) return new StateImpl(0); + if(defaultRouteStates.containsKey(stateId)) return defaultRouteStates.get(stateId); return null; }