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

final changes

Browse source
This commit is contained in:
Iris 2018-03-08 10:49:19 +02:00
parent 4e8ed3a9c0
commit b8894c3276
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/MaxTimeInVehicleConstraint.java
View file

@ -106,7 +106,7 @@ public class MaxTimeInVehicleConstraint implements HardActivityConstraint {
try { try {
minSlack = stateManager.getActivityState(nextAct, iFacts.getNewVehicle(), minSlackId, Double.class); minSlack = stateManager.getActivityState(nextAct, iFacts.getNewVehicle(), minSlackId, Double.class);
} catch (NullPointerException npe) { } catch (NullPointerException npe) {
//solving maxTimeInVehicle constraint
} }
} }
double directArrTimeNextAct = prevActDepTime + transportTime.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevActDepTime, iFacts.getNewDriver(), iFacts.getNewVehicle()); double directArrTimeNextAct = prevActDepTime + transportTime.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevActDepTime, iFacts.getNewDriver(), iFacts.getNewVehicle());

2
jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/MaxTimeInVehicleTest.java
View file

@ -220,7 +220,7 @@ public class MaxTimeInVehicleTest {
.build(); .build();
Delivery d2 = Delivery.Builder.newInstance("d2") Delivery d2 = Delivery.Builder.newInstance("d2")
.setMaxTimeInVehicle(15) .setMaxTimeInVehicle(14)
.setLocation(Location.newInstance(10, 5)).setServiceTime(2).build(); .setLocation(Location.newInstance(10, 5)).setServiceTime(2).build();
VehicleImpl v1 = VehicleImpl.Builder.newInstance("v1") VehicleImpl v1 = VehicleImpl.Builder.newInstance("v1")