diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java b/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java index 1774d854..b2f8fb75 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java @@ -104,9 +104,9 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart private Object[][][] vehicle_dependent_activity_states; - private Object[][] route_states; - - private Object[][][] vehicle_dependent_route_states; +// private Object[][] route_states; +// +// private Object[][][] vehicle_dependent_route_states; private Map route_state_map; @@ -129,9 +129,9 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart if(createdStateIds.containsKey(name)) return createdStateIds.get(name); if(stateIndexCounter>=activity_states[0].length){ activity_states = new Object[vrp.getNuActivities()+1][stateIndexCounter+1]; - route_states = new Object[vrp.getNuActivities()+1][stateIndexCounter+1]; +// route_states = new Object[vrp.getNuActivities()+1][stateIndexCounter+1]; vehicle_dependent_activity_states = new Object[nuActivities][nuVehicleTypeKeys][stateIndexCounter+1]; - vehicle_dependent_route_states = new Object[nuActivities][nuVehicleTypeKeys][stateIndexCounter+1]; +// vehicle_dependent_route_states = new Object[nuActivities][nuVehicleTypeKeys][stateIndexCounter+1]; } StateId id = StateFactory.createId(name, stateIndexCounter); incStateIndexCounter(); @@ -156,9 +156,9 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart nuActivities = Math.max(10, vrp.getNuActivities() + 1); nuVehicleTypeKeys = Math.max(3, getNuVehicleTypes(vrp) + 2); activity_states = new Object[nuActivities][initialStateArrayLength]; - route_states = new Object[nuActivities][initialStateArrayLength]; +// route_states = new Object[nuActivities][initialStateArrayLength]; vehicle_dependent_activity_states = new Object[nuActivities][nuVehicleTypeKeys][initialStateArrayLength]; - vehicle_dependent_route_states = new Object[nuActivities][nuVehicleTypeKeys][initialStateArrayLength]; +// vehicle_dependent_route_states = new Object[nuActivities][nuVehicleTypeKeys][initialStateArrayLength]; route_state_map = new HashMap(); vehicle_dependent_route_state_map = new HashMap(); } @@ -203,10 +203,12 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart */ public void clear(){ fill_twoDimArr(activity_states, null); - fill_twoDimArr(route_states, null); +// fill_twoDimArr(route_states, null); fill_threeDimArr(vehicle_dependent_activity_states, null); - fill_threeDimArr(vehicle_dependent_route_states, null); +// fill_threeDimArr(vehicle_dependent_route_states, null); problemStates_.clear(); + route_state_map.clear(); + vehicle_dependent_route_state_map.clear(); } private void fill_threeDimArr(Object[][][] states, Object o) { diff --git a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExampleWithPenaltyVehicles.java b/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExampleWithPenaltyVehicles.java index 3269c85f..b36f7f81 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExampleWithPenaltyVehicles.java +++ b/jsprit-examples/src/main/java/jsprit/examples/MultipleDepotExampleWithPenaltyVehicles.java @@ -107,7 +107,7 @@ public class MultipleDepotExampleWithPenaltyVehicles { * solve the problem */ VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "input/algorithmConfig.xml"); - vra.setMaxIterations(2000); + vra.setMaxIterations(10000); vra.getAlgorithmListeners().addListener(new StopWatch(),Priority.HIGH); // vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/progress.png")); Collection solutions = vra.searchSolutions();