trans/graphhopper-jsprit
1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Code Issues Releases Wiki Activity

removed constructor from StateManager and its according implications

Browse source
This commit is contained in:
oblonski 2014-07-17 11:55:33 +02:00
parent 4d3e5be4fb
commit 279826f061
10 changed files with 99 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

23
jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java
View file

@ -161,15 +161,6 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
}
@Deprecated
public StateManager(VehicleRoutingTransportCosts routingCosts){
this.routingCosts = routingCosts;
nuActivities = 101;
activity_states = new Object[nuActivities][initialNuStates];
route_states = new Object[nuActivities][initialNuStates];
addDefaultStates();
}
public StateManager(VehicleRoutingProblem vehicleRoutingProblem){
this.routingCosts = vehicleRoutingProblem.getTransportCosts();
this.vrp = vehicleRoutingProblem;
@ -243,16 +234,14 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
*
*/
public void clear(){
fill(activity_states, null);
fill(route_states, null);
fill_(vehicle_dependent_activity_states, null);
fill_(vehicle_dependent_route_states,null);
// vehicle_dependent_activity_states = new Object[nuActivities][nuVehicleTypeKeys][initialNuStates];
// vehicle_dependent_route_states = new Object[nuActivities][nuVehicleTypeKeys][initialNuStates];
fill_twoDimArr(activity_states, null);
fill_twoDimArr(route_states, null);
fill_threeDimArr(vehicle_dependent_activity_states, null);
fill_threeDimArr(vehicle_dependent_route_states, null);
problemStates_.clear();
}
private void fill_(Object[][][] states, Object o) {
private void fill_threeDimArr(Object[][][] states, Object o) {
for(Object[][] twoDimArr : states){
for(Object[] oneDimArr : twoDimArr){
Arrays.fill(oneDimArr,o);
@ -260,7 +249,7 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
}
}
private void fill(Object[][] states, Object o) {
private void fill_twoDimArr(Object[][] states, Object o) {
for(Object[] rows : states){
Arrays.fill(rows,o);
}