From 0c8c4ae4e36f4d320bfaaebab17fca4590066930 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Thu, 22 Aug 2013 11:56:27 +0200 Subject: [PATCH] rename StateContainer to StateManager --- .../java/algorithms/CalculatesServiceInsertion.java | 6 +++--- ...CalculatesServiceInsertionConsideringFixCost.java | 8 ++++---- .../CalculatesServiceInsertionOnRouteLevel.java | 4 ++-- ...ulatesServiceInsertionWithTriangleInequality.java | 8 ++++---- .../src/main/java/algorithms/CalculatorBuilder.java | 12 ++++++------ .../src/main/java/algorithms/InsertionFactory.java | 2 +- .../{StatesContainer.java => StateManager.java} | 4 +--- ...tatesContainerImpl.java => StateManagerImpl.java} | 6 +++--- .../main/java/algorithms/UdateCostsAtRouteLevel.java | 4 ++-- .../main/java/algorithms/UpdateCostsAtAllLevels.java | 6 +++--- .../UpdateEarliestStartTimeWindowAtActLocations.java | 6 +++--- ...UpdateLatestOperationStartTimeAtActLocations.java | 6 +++--- .../main/java/algorithms/UpdateLoadAtAllLevels.java | 6 +++--- .../main/java/algorithms/UpdateLoadAtRouteLevel.java | 6 +++--- .../src/main/java/algorithms/UpdateStates.java | 2 +- .../java/algorithms/VehicleRoutingAlgorithms.java | 12 ++++++------ .../test/java/algorithms/GendreauPostOptTest.java | 4 ++-- .../algorithms/TestCalculatesServiceInsertion.java | 4 ++-- .../TestCalculatesServiceInsertionOnRouteLevel.java | 4 ++-- .../algorithms/TestIterateRouteForwardInTime.java | 8 ++++---- .../algorithms/TestTourStateUpdaterWithService.java | 4 ++-- 21 files changed, 60 insertions(+), 62 deletions(-) rename jsprit-core/src/main/java/algorithms/{StatesContainer.java => StateManager.java} (94%) rename jsprit-core/src/main/java/algorithms/{StatesContainerImpl.java => StateManagerImpl.java} (96%) diff --git a/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertion.java b/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertion.java index 616f60be..55f896cc 100644 --- a/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertion.java +++ b/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertion.java @@ -15,7 +15,7 @@ package algorithms; import org.apache.log4j.Logger; import util.Neighborhood; -import algorithms.StatesContainer.State; +import algorithms.StateManager.State; import basics.Job; import basics.Service; import basics.costs.VehicleRoutingActivityCosts; @@ -36,7 +36,7 @@ final class CalculatesServiceInsertion implements JobInsertionCalculator{ private static final Logger logger = Logger.getLogger(CalculatesServiceInsertion.class); - private StatesContainer states; + private StateManager states; private VehicleRoutingTransportCosts routingCosts; @@ -61,7 +61,7 @@ final class CalculatesServiceInsertion implements JobInsertionCalculator{ logger.info("initialise neighborhood " + neighborhood); } - public void setActivityStates(StatesContainer activityStates2){ + public void setActivityStates(StateManager activityStates2){ this.states = activityStates2; } diff --git a/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionConsideringFixCost.java b/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionConsideringFixCost.java index dd078540..1961ec84 100644 --- a/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionConsideringFixCost.java +++ b/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionConsideringFixCost.java @@ -23,8 +23,8 @@ package algorithms; import org.apache.log4j.Logger; import algorithms.InsertionData.NoInsertionFound; -import algorithms.StatesContainer.State; -import algorithms.StatesContainer.States; +import algorithms.StateManager.State; +import algorithms.StateManager.States; import basics.Job; import basics.route.Driver; import basics.route.Vehicle; @@ -43,9 +43,9 @@ final class CalculatesServiceInsertionConsideringFixCost implements JobInsertion private double solution_completeness_ratio = 0.5; - private StatesContainer states; + private StateManager states; - public CalculatesServiceInsertionConsideringFixCost(final JobInsertionCalculator standardInsertionCalculator, StatesContainer activityStates2) { + public CalculatesServiceInsertionConsideringFixCost(final JobInsertionCalculator standardInsertionCalculator, StateManager activityStates2) { super(); this.standardServiceInsertion = standardInsertionCalculator; this.states = activityStates2; diff --git a/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionOnRouteLevel.java b/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionOnRouteLevel.java index 85164555..d1fff312 100644 --- a/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionOnRouteLevel.java +++ b/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionOnRouteLevel.java @@ -51,7 +51,7 @@ final class CalculatesServiceInsertionOnRouteLevel implements JobInsertionCalcul private AuxilliaryCostCalculator auxilliaryPathCostCalculator; - private StatesContainer states; + private StateManager states; private int nuOfActsForwardLooking = 0; @@ -90,7 +90,7 @@ final class CalculatesServiceInsertionOnRouteLevel implements JobInsertionCalcul logger.info("initialise " + this); } - public void setActivityStates(StatesContainer activityStates2){ + public void setActivityStates(StateManager activityStates2){ this.states = activityStates2; } diff --git a/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionWithTriangleInequality.java b/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionWithTriangleInequality.java index 8281d5ff..0a702bbe 100644 --- a/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionWithTriangleInequality.java +++ b/jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionWithTriangleInequality.java @@ -17,8 +17,8 @@ import org.apache.log4j.Logger; import util.Neighborhood; import algorithms.RouteStates.ActivityState; -import algorithms.StatesContainer.State; -import algorithms.StatesContainer.States; +import algorithms.StateManager.State; +import algorithms.StateManager.States; import basics.Job; import basics.Service; import basics.costs.VehicleRoutingActivityCosts; @@ -62,7 +62,7 @@ final class CalculatesServiceInsertionWithTriangleInequality implements JobInser private static final Logger logger = Logger.getLogger(CalculatesServiceInsertionWithTriangleInequality.class); - private StatesContainer routeStates; + private StateManager routeStates; private VehicleRoutingTransportCosts routingCosts; @@ -95,7 +95,7 @@ final class CalculatesServiceInsertionWithTriangleInequality implements JobInser logger.info("initialise neighborhood " + neighborhood); } - public void setActivityStates(StatesContainer activityStates2){ + public void setActivityStates(StateManager activityStates2){ this.routeStates = activityStates2; } diff --git a/jsprit-core/src/main/java/algorithms/CalculatorBuilder.java b/jsprit-core/src/main/java/algorithms/CalculatorBuilder.java index 346f2c8a..f9b42f1c 100644 --- a/jsprit-core/src/main/java/algorithms/CalculatorBuilder.java +++ b/jsprit-core/src/main/java/algorithms/CalculatorBuilder.java @@ -70,7 +70,7 @@ class CalculatorBuilder { private VehicleRoutingProblem vrp; - private StatesContainer states; + private StateManager states; private boolean local = true; @@ -111,7 +111,7 @@ class CalculatorBuilder { * * @return */ - public CalculatorBuilder setStates(StatesContainer states){ + public CalculatorBuilder setStates(StateManager states){ this.states = states; return this; } @@ -221,7 +221,7 @@ class CalculatorBuilder { } } - private CalculatorPlusListeners createStandardLocal(VehicleRoutingProblem vrp, StatesContainer activityStates2){ + private CalculatorPlusListeners createStandardLocal(VehicleRoutingProblem vrp, StateManager activityStates2){ JobInsertionCalculator standardServiceInsertion = new CalculatesServiceInsertion(vrp.getTransportCosts(), vrp.getActivityCosts()); // JobInsertionCalculator standardServiceInsertion = new CalculatesServiceInsertionWithTriangleInequality(vrp.getTransportCosts(), vrp.getActivityCosts()); // ((CalculatesServiceInsertionWithTriangleInequality) standardServiceInsertion).setActivityStates(activityStates2); @@ -234,7 +234,7 @@ class CalculatorBuilder { return calcPlusListeners; } - private CalculatorPlusListeners createCalculatorConsideringFixedCosts(VehicleRoutingProblem vrp, JobInsertionCalculator baseCalculator, StatesContainer activityStates2, double weightOfFixedCosts){ + private CalculatorPlusListeners createCalculatorConsideringFixedCosts(VehicleRoutingProblem vrp, JobInsertionCalculator baseCalculator, StateManager activityStates2, double weightOfFixedCosts){ final CalculatesServiceInsertionConsideringFixCost withFixCost = new CalculatesServiceInsertionConsideringFixCost(baseCalculator, activityStates2); withFixCost.setWeightOfFixCost(weightOfFixedCosts); CalculatorPlusListeners calcPlusListeners = new CalculatorPlusListeners(withFixCost); @@ -242,7 +242,7 @@ class CalculatorBuilder { return calcPlusListeners; } - private CalculatorPlusListeners createStandardRoute(VehicleRoutingProblem vrp, StatesContainer activityStates2, int forwardLooking, int solutionMemory){ + private CalculatorPlusListeners createStandardRoute(VehicleRoutingProblem vrp, StateManager activityStates2, int forwardLooking, int solutionMemory){ int after = forwardLooking; JobInsertionCalculator jobInsertionCalculator = new CalculatesServiceInsertionOnRouteLevel(vrp.getTransportCosts(), vrp.getActivityCosts()); ((CalculatesServiceInsertionOnRouteLevel)jobInsertionCalculator).setNuOfActsForwardLooking(after); @@ -253,7 +253,7 @@ class CalculatorBuilder { return calcPlusListener; } - private JobInsertionCalculator createFinalInsertion(VehicleFleetManager fleetManager, JobInsertionCalculator baseCalc, StatesContainer activityStates2){ + private JobInsertionCalculator createFinalInsertion(VehicleFleetManager fleetManager, JobInsertionCalculator baseCalc, StateManager activityStates2){ return new CalculatesVehTypeDepServiceInsertion(fleetManager, baseCalc); } diff --git a/jsprit-core/src/main/java/algorithms/InsertionFactory.java b/jsprit-core/src/main/java/algorithms/InsertionFactory.java index 6d592423..ed82df20 100644 --- a/jsprit-core/src/main/java/algorithms/InsertionFactory.java +++ b/jsprit-core/src/main/java/algorithms/InsertionFactory.java @@ -38,7 +38,7 @@ class InsertionFactory { private static Logger log = Logger.getLogger(InsertionFactory.class); public static InsertionStrategy createInsertion(VehicleRoutingProblem vrp, HierarchicalConfiguration config, - VehicleFleetManager vehicleFleetManager, StatesContainerImpl routeStates, List algorithmListeners, ExecutorService executorService, int nuOfThreads){ + VehicleFleetManager vehicleFleetManager, StateManagerImpl routeStates, List algorithmListeners, ExecutorService executorService, int nuOfThreads){ boolean concurrentInsertion = false; if(executorService != null) concurrentInsertion = true; if(config.containsKey("[@name]")){ diff --git a/jsprit-core/src/main/java/algorithms/StatesContainer.java b/jsprit-core/src/main/java/algorithms/StateManager.java similarity index 94% rename from jsprit-core/src/main/java/algorithms/StatesContainer.java rename to jsprit-core/src/main/java/algorithms/StateManager.java index b43fcbf0..e0734ae4 100644 --- a/jsprit-core/src/main/java/algorithms/StatesContainer.java +++ b/jsprit-core/src/main/java/algorithms/StateManager.java @@ -1,11 +1,9 @@ package algorithms; -import java.util.Map; - import basics.route.TourActivity; import basics.route.VehicleRoute; -interface StatesContainer { +interface StateManager { interface State { double toDouble(); diff --git a/jsprit-core/src/main/java/algorithms/StatesContainerImpl.java b/jsprit-core/src/main/java/algorithms/StateManagerImpl.java similarity index 96% rename from jsprit-core/src/main/java/algorithms/StatesContainerImpl.java rename to jsprit-core/src/main/java/algorithms/StateManagerImpl.java index d2aa03e2..b16f0d2c 100644 --- a/jsprit-core/src/main/java/algorithms/StatesContainerImpl.java +++ b/jsprit-core/src/main/java/algorithms/StateManagerImpl.java @@ -7,7 +7,7 @@ import java.util.Map; import basics.route.TourActivity; import basics.route.VehicleRoute; -class StatesContainerImpl implements StatesContainer{ +class StateManagerImpl implements StateManager{ static class StatesImpl implements States{ @@ -24,9 +24,9 @@ class StatesContainerImpl implements StatesContainer{ } - private Map vehicleRouteStates = new HashMap(); + private Map vehicleRouteStates = new HashMap(); - private Map activityStates = new HashMap(); + private Map activityStates = new HashMap(); public Map getRouteStates() { return Collections.unmodifiableMap(vehicleRouteStates); diff --git a/jsprit-core/src/main/java/algorithms/UdateCostsAtRouteLevel.java b/jsprit-core/src/main/java/algorithms/UdateCostsAtRouteLevel.java index a82040b7..7ad93067 100644 --- a/jsprit-core/src/main/java/algorithms/UdateCostsAtRouteLevel.java +++ b/jsprit-core/src/main/java/algorithms/UdateCostsAtRouteLevel.java @@ -12,13 +12,13 @@ import basics.route.VehicleRoute; class UdateCostsAtRouteLevel implements JobInsertedListener, InsertionStartsListener, InsertionEndsListener{ - private StatesContainerImpl states; + private StateManagerImpl states; private VehicleRoutingTransportCosts tpCosts; private VehicleRoutingActivityCosts actCosts; - public UdateCostsAtRouteLevel(StatesContainerImpl states, VehicleRoutingTransportCosts tpCosts, VehicleRoutingActivityCosts actCosts) { + public UdateCostsAtRouteLevel(StateManagerImpl states, VehicleRoutingTransportCosts tpCosts, VehicleRoutingActivityCosts actCosts) { super(); this.states = states; this.tpCosts = tpCosts; diff --git a/jsprit-core/src/main/java/algorithms/UpdateCostsAtAllLevels.java b/jsprit-core/src/main/java/algorithms/UpdateCostsAtAllLevels.java index 38b511e9..2cc6bcf7 100644 --- a/jsprit-core/src/main/java/algorithms/UpdateCostsAtAllLevels.java +++ b/jsprit-core/src/main/java/algorithms/UpdateCostsAtAllLevels.java @@ -1,7 +1,7 @@ package algorithms; import algorithms.ForwardInTimeListeners.ForwardInTimeListener; -import algorithms.StatesContainer.StateImpl; +import algorithms.StateManager.StateImpl; import basics.costs.ForwardTransportCost; import basics.costs.VehicleRoutingActivityCosts; import basics.route.End; @@ -15,7 +15,7 @@ class UpdateCostsAtAllLevels implements ForwardInTimeListener{ private ForwardTransportCost transportCost; - private StatesContainerImpl states; + private StateManagerImpl states; private double totalOperationCost = 0.0; @@ -25,7 +25,7 @@ class UpdateCostsAtAllLevels implements ForwardInTimeListener{ private double startTimeAtPrevAct = 0.0; - public UpdateCostsAtAllLevels(VehicleRoutingActivityCosts activityCost, ForwardTransportCost transportCost, StatesContainerImpl states) { + public UpdateCostsAtAllLevels(VehicleRoutingActivityCosts activityCost, ForwardTransportCost transportCost, StateManagerImpl states) { super(); this.activityCost = activityCost; this.transportCost = transportCost; diff --git a/jsprit-core/src/main/java/algorithms/UpdateEarliestStartTimeWindowAtActLocations.java b/jsprit-core/src/main/java/algorithms/UpdateEarliestStartTimeWindowAtActLocations.java index 98a0fab1..1fab69ef 100644 --- a/jsprit-core/src/main/java/algorithms/UpdateEarliestStartTimeWindowAtActLocations.java +++ b/jsprit-core/src/main/java/algorithms/UpdateEarliestStartTimeWindowAtActLocations.java @@ -1,7 +1,7 @@ package algorithms; import algorithms.ForwardInTimeListeners.ForwardInTimeListener; -import algorithms.StatesContainer.StateImpl; +import algorithms.StateManager.StateImpl; import basics.route.End; import basics.route.Start; import basics.route.TourActivity; @@ -9,9 +9,9 @@ import basics.route.VehicleRoute; class UpdateEarliestStartTimeWindowAtActLocations implements ForwardInTimeListener{ - private StatesContainerImpl states; + private StateManagerImpl states; - public UpdateEarliestStartTimeWindowAtActLocations(StatesContainerImpl states) { + public UpdateEarliestStartTimeWindowAtActLocations(StateManagerImpl states) { super(); this.states = states; } diff --git a/jsprit-core/src/main/java/algorithms/UpdateLatestOperationStartTimeAtActLocations.java b/jsprit-core/src/main/java/algorithms/UpdateLatestOperationStartTimeAtActLocations.java index a4a1be95..6c65282e 100644 --- a/jsprit-core/src/main/java/algorithms/UpdateLatestOperationStartTimeAtActLocations.java +++ b/jsprit-core/src/main/java/algorithms/UpdateLatestOperationStartTimeAtActLocations.java @@ -1,7 +1,7 @@ package algorithms; import algorithms.BackwardInTimeListeners.BackwardInTimeListener; -import algorithms.StatesContainer.StateImpl; +import algorithms.StateManager.StateImpl; import basics.route.End; import basics.route.Start; import basics.route.TourActivity; @@ -9,9 +9,9 @@ import basics.route.VehicleRoute; class UpdateLatestOperationStartTimeAtActLocations implements BackwardInTimeListener{ - private StatesContainerImpl states; + private StateManagerImpl states; - public UpdateLatestOperationStartTimeAtActLocations(StatesContainerImpl states) { + public UpdateLatestOperationStartTimeAtActLocations(StateManagerImpl states) { super(); this.states = states; } diff --git a/jsprit-core/src/main/java/algorithms/UpdateLoadAtAllLevels.java b/jsprit-core/src/main/java/algorithms/UpdateLoadAtAllLevels.java index 200b320a..5de4cdc2 100644 --- a/jsprit-core/src/main/java/algorithms/UpdateLoadAtAllLevels.java +++ b/jsprit-core/src/main/java/algorithms/UpdateLoadAtAllLevels.java @@ -1,7 +1,7 @@ package algorithms; import algorithms.ForwardInTimeListeners.ForwardInTimeListener; -import algorithms.StatesContainer.StateImpl; +import algorithms.StateManager.StateImpl; import basics.route.End; import basics.route.Start; import basics.route.TourActivity; @@ -17,11 +17,11 @@ class UpdateLoadAtAllLevels implements ForwardInTimeListener{ private double load = 0.0; - private StatesContainerImpl states; + private StateManagerImpl states; private VehicleRoute vehicleRoute; - public UpdateLoadAtAllLevels(StatesContainerImpl states) { + public UpdateLoadAtAllLevels(StateManagerImpl states) { super(); this.states = states; } diff --git a/jsprit-core/src/main/java/algorithms/UpdateLoadAtRouteLevel.java b/jsprit-core/src/main/java/algorithms/UpdateLoadAtRouteLevel.java index fbfe2d89..5ed2adc1 100644 --- a/jsprit-core/src/main/java/algorithms/UpdateLoadAtRouteLevel.java +++ b/jsprit-core/src/main/java/algorithms/UpdateLoadAtRouteLevel.java @@ -2,7 +2,7 @@ package algorithms; import java.util.Collection; -import algorithms.StatesContainer.StateImpl; +import algorithms.StateManager.StateImpl; import basics.Job; import basics.Service; import basics.algo.InsertionStartsListener; @@ -11,9 +11,9 @@ import basics.route.VehicleRoute; class UpdateLoadAtRouteLevel implements JobInsertedListener, InsertionStartsListener{ - private StatesContainerImpl states; + private StateManagerImpl states; - public UpdateLoadAtRouteLevel(StatesContainerImpl states) { + public UpdateLoadAtRouteLevel(StateManagerImpl states) { super(); this.states = states; } diff --git a/jsprit-core/src/main/java/algorithms/UpdateStates.java b/jsprit-core/src/main/java/algorithms/UpdateStates.java index f59ce561..0d61558d 100644 --- a/jsprit-core/src/main/java/algorithms/UpdateStates.java +++ b/jsprit-core/src/main/java/algorithms/UpdateStates.java @@ -15,7 +15,7 @@ class UpdateStates implements JobInsertedListener, RuinListener{ private IterateRouteBackwardInTime iterateBackward; - public UpdateStates(StatesContainerImpl states, VehicleRoutingTransportCosts routingCosts, VehicleRoutingActivityCosts activityCosts) { + public UpdateStates(StateManagerImpl states, VehicleRoutingTransportCosts routingCosts, VehicleRoutingActivityCosts activityCosts) { iterateForward = new IterateRouteForwardInTime(routingCosts); iterateForward.addListener(new UpdateActivityTimes()); diff --git a/jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java b/jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java index 54f1d145..0f52a27c 100644 --- a/jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java +++ b/jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java @@ -448,7 +448,7 @@ public class VehicleRoutingAlgorithms { algorithmListeners.add(new PrioritizedVRAListener(Priority.LOW, new SolutionVerifier())); - final StatesContainerImpl routeStates = new StatesContainerImpl(); + final StateManagerImpl routeStates = new StateManagerImpl(); IterationStartsListener resetStates = new IterationStartsListener() { @Override @@ -570,7 +570,7 @@ public class VehicleRoutingAlgorithms { metaAlgorithm.getAlgorithmListeners().addAll(algorithmListeners); } - private static AlgorithmStartsListener createInitialSolution(XMLConfiguration config, final VehicleRoutingProblem vrp, VehicleFleetManager vehicleFleetManager, StatesContainerImpl routeStates, Set algorithmListeners, TypedMap definedClasses, ExecutorService executorService, int nuOfThreads) { + private static AlgorithmStartsListener createInitialSolution(XMLConfiguration config, final VehicleRoutingProblem vrp, VehicleFleetManager vehicleFleetManager, StateManagerImpl routeStates, Set algorithmListeners, TypedMap definedClasses, ExecutorService executorService, int nuOfThreads) { List modConfigs = config.configurationsAt("construction.insertion"); if(modConfigs == null) return null; if(modConfigs.isEmpty()) return null; @@ -667,7 +667,7 @@ public class VehicleRoutingAlgorithms { } private static SearchStrategyModule buildModule(HierarchicalConfiguration moduleConfig, final VehicleRoutingProblem vrp, VehicleFleetManager vehicleFleetManager, - final StatesContainerImpl routeStates, Set algorithmListeners, TypedMap definedClasses, ExecutorService executorService, int nuOfThreads) { + final StateManagerImpl routeStates, Set algorithmListeners, TypedMap definedClasses, ExecutorService executorService, int nuOfThreads) { String moduleName = moduleConfig.getString("[@name]"); if(moduleName == null) throw new IllegalStateException("module(-name) is missing."); String moduleId = moduleConfig.getString("[@id]"); @@ -805,7 +805,7 @@ public class VehicleRoutingAlgorithms { "\n\tgendreauPostOpt"); } - private static RuinStrategy getRadialRuin(final VehicleRoutingProblem vrp, final StatesContainerImpl routeStates, TypedMap definedClasses, ModKey modKey, double shareToRuin, JobDistance jobDistance) { + private static RuinStrategy getRadialRuin(final VehicleRoutingProblem vrp, final StateManagerImpl routeStates, TypedMap definedClasses, ModKey modKey, double shareToRuin, JobDistance jobDistance) { RuinStrategyKey stratKey = new RuinStrategyKey(modKey); RuinStrategy ruin = definedClasses.get(stratKey); if(ruin == null){ @@ -816,7 +816,7 @@ public class VehicleRoutingAlgorithms { return ruin; } - private static RuinStrategy getRandomRuin(final VehicleRoutingProblem vrp, final StatesContainerImpl routeStates, TypedMap definedClasses, ModKey modKey, double shareToRuin) { + private static RuinStrategy getRandomRuin(final VehicleRoutingProblem vrp, final StateManagerImpl routeStates, TypedMap definedClasses, ModKey modKey, double shareToRuin) { RuinStrategyKey stratKey = new RuinStrategyKey(modKey); RuinStrategy ruin = definedClasses.get(stratKey); if(ruin == null){ @@ -827,7 +827,7 @@ public class VehicleRoutingAlgorithms { return ruin; } - private static InsertionStrategy createInsertionStrategy(HierarchicalConfiguration moduleConfig, VehicleRoutingProblem vrp,VehicleFleetManager vehicleFleetManager, StatesContainerImpl routeStates, List algorithmListeners, ExecutorService executorService, int nuOfThreads) { + private static InsertionStrategy createInsertionStrategy(HierarchicalConfiguration moduleConfig, VehicleRoutingProblem vrp,VehicleFleetManager vehicleFleetManager, StateManagerImpl routeStates, List algorithmListeners, ExecutorService executorService, int nuOfThreads) { InsertionStrategy insertion = InsertionFactory.createInsertion(vrp, moduleConfig, vehicleFleetManager, routeStates, algorithmListeners, executorService, nuOfThreads); return insertion; } diff --git a/jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java b/jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java index 0f367fd8..95053c21 100644 --- a/jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java +++ b/jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java @@ -71,7 +71,7 @@ public class GendreauPostOptTest { Service job3; - private StatesContainerImpl states; + private StateManagerImpl states; private List vehicles; @@ -147,7 +147,7 @@ public class GendreauPostOptTest { // Collection vehicles = Arrays.asList(lightVehicle1,lightVehicle2, heavyVehicle); fleetManager = new VehicleFleetManagerImpl(vehicles); - states = new StatesContainerImpl(); + states = new StateManagerImpl(); activityCosts = new ExampleActivityCostFunction(); diff --git a/jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertion.java b/jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertion.java index 7b13d457..61e8daea 100644 --- a/jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertion.java +++ b/jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertion.java @@ -62,7 +62,7 @@ public class TestCalculatesServiceInsertion { private Service third; - private StatesContainerImpl states; + private StateManagerImpl states; private NoDriver driver; @@ -152,7 +152,7 @@ public class TestCalculatesServiceInsertion { jobs.add(second); jobs.add(third); - states = new StatesContainerImpl(); + states = new StateManagerImpl(); ExampleActivityCostFunction activityCosts = new ExampleActivityCostFunction(); diff --git a/jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertionOnRouteLevel.java b/jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertionOnRouteLevel.java index 56668a05..dea215cb 100644 --- a/jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertionOnRouteLevel.java +++ b/jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertionOnRouteLevel.java @@ -65,7 +65,7 @@ public class TestCalculatesServiceInsertionOnRouteLevel { private Service third; - private StatesContainerImpl states; + private StateManagerImpl states; private NoDriver driver; @@ -143,7 +143,7 @@ public class TestCalculatesServiceInsertionOnRouteLevel { jobs.add(second); jobs.add(third); - states = new StatesContainerImpl(); + states = new StateManagerImpl(); ExampleActivityCostFunction activityCosts = new ExampleActivityCostFunction(); serviceInsertion = new CalculatesServiceInsertionOnRouteLevel(costs,activityCosts); diff --git a/jsprit-core/src/test/java/algorithms/TestIterateRouteForwardInTime.java b/jsprit-core/src/test/java/algorithms/TestIterateRouteForwardInTime.java index 74d13242..e3553e2a 100644 --- a/jsprit-core/src/test/java/algorithms/TestIterateRouteForwardInTime.java +++ b/jsprit-core/src/test/java/algorithms/TestIterateRouteForwardInTime.java @@ -129,7 +129,7 @@ public class TestIterateRouteForwardInTime { @Test public void whenIteratingWithLoadUpdateAtActLocations_itShouldUpdateLoad() { IterateRouteForwardInTime forwardInTime = new IterateRouteForwardInTime(cost); - StatesContainerImpl states = new StatesContainerImpl(); + StateManagerImpl states = new StateManagerImpl(); forwardInTime.addListener(new UpdateLoadAtAllLevels(states)); forwardInTime.iterate(vehicleRoute); @@ -153,7 +153,7 @@ public class TestIterateRouteForwardInTime { @Test public void testStatesOfAct1(){ IterateRouteForwardInTime forwardInTime = new IterateRouteForwardInTime(cost); - StatesContainerImpl states = new StatesContainerImpl(); + StateManagerImpl states = new StateManagerImpl(); forwardInTime.addListener(new UpdateLoadAtAllLevels(states)); forwardInTime.addListener(new UpdateEarliestStartTimeWindowAtActLocations(states)); forwardInTime.addListener(new UpdateCostsAtAllLevels(new DefaultVehicleRoutingActivityCosts(), cost, states)); @@ -168,7 +168,7 @@ public class TestIterateRouteForwardInTime { @Test public void testStatesOfAct2(){ IterateRouteForwardInTime forwardInTime = new IterateRouteForwardInTime(cost); - StatesContainerImpl states = new StatesContainerImpl(); + StateManagerImpl states = new StateManagerImpl(); forwardInTime.addListener(new UpdateLoadAtAllLevels(states)); forwardInTime.addListener(new UpdateEarliestStartTimeWindowAtActLocations(states)); forwardInTime.addListener(new UpdateCostsAtAllLevels(new DefaultVehicleRoutingActivityCosts(), cost, states)); @@ -183,7 +183,7 @@ public class TestIterateRouteForwardInTime { @Test public void testStatesOfAct3(){ IterateRouteForwardInTime forwardInTime = new IterateRouteForwardInTime(cost); - StatesContainerImpl states = new StatesContainerImpl(); + StateManagerImpl states = new StateManagerImpl(); forwardInTime.addListener(new UpdateActivityTimes()); forwardInTime.addListener(new UpdateCostsAtAllLevels(new DefaultVehicleRoutingActivityCosts(), cost, states)); forwardInTime.iterate(vehicleRoute); diff --git a/jsprit-core/src/test/java/algorithms/TestTourStateUpdaterWithService.java b/jsprit-core/src/test/java/algorithms/TestTourStateUpdaterWithService.java index 518a075f..6ced378f 100644 --- a/jsprit-core/src/test/java/algorithms/TestTourStateUpdaterWithService.java +++ b/jsprit-core/src/test/java/algorithms/TestTourStateUpdaterWithService.java @@ -54,7 +54,7 @@ public class TestTourStateUpdaterWithService { UpdateStates updateStates; - StatesContainerImpl states; + StateManagerImpl states; private VehicleRoute vehicleRoute; @@ -101,7 +101,7 @@ public class TestTourStateUpdaterWithService { services.add(firstService); services.add(secondService); - states = new StatesContainerImpl(); + states = new StateManagerImpl(); VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("test", 0).build(); vehicle = VehicleImpl.Builder.newInstance("testvehicle").setType(type).setLocationId("0,0")