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

added further unit tests

Browse source
This commit is contained in:
oblonski 2014-07-14 09:36:21 +02:00
parent bfab93f3d9
commit 3e2f4a41a7
3 changed files with 270 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute.java
View file

@ -50,7 +50,6 @@ class UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute implements
private VehicleRoute route;
private Capacity maxLoad = Capacity.Builder.newInstance().build();
// private double maxLoad;
public UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute(StateManager stateManager) {
super();
@ -61,19 +60,14 @@ class UpdateMaxCapacityUtilisationAtActivitiesByLookingForwardInRoute implements
public void begin(VehicleRoute route) {
this.route = route;
maxLoad = stateManager.getRouteState(route, StateFactory.LOAD_AT_END, Capacity.class);
// maxLoad = stateManager.getRouteState(route, StateFactory.LOAD_AT_END).toDouble();
}
@Override
public void visit(TourActivity act) {
maxLoad = Capacity.max(maxLoad, stateManager.getActivityState(act, StateFactory.LOAD, Capacity.class));
// maxLoad = Math.max(maxLoad, stateManager.getActivityState(act, StateFactory.LOAD).toDouble());
stateManager.putInternalTypedActivityState(act, StateFactory.FUTURE_MAXLOAD, Capacity.class, maxLoad);
// stateManager.putInternalActivityState(act, StateFactory.FUTURE_MAXLOAD, StateFactory.createState(maxLoad));
assert maxLoad.isLessOrEqual(route.getVehicle().getType().getCapacityDimensions()) : "maxLoad can in every capacity dimension never be bigger than vehicleCap";
// assert maxLoad <= route.getVehicle().getCapacity() : "maxLoad can never be bigger than vehicleCap";
assert maxLoad.isGreaterOrEqual(Capacity.Builder.newInstance().build()) : "maxLoad can never be smaller than 0";
// assert maxLoad >= 0 : "maxLoad can never be smaller than 0";
}
@Override