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

Merge branch 'PickupAndDelivery' of https://github.com/jsprit/jsprit.git into pickupAndDelivery

Browse source
This commit is contained in:
Stefan Schroeder 2013-11-13 11:18:58 +01:00
commit 7a5f1052df
62 changed files with 60070 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-core/src/main/java/algorithms/RemoveEmptyVehicles.java
View file

@ -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);

2
jsprit-core/src/main/java/algorithms/StateManager.java
View file

@ -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;
}