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

modified access/egress calc to reflect open routes

Browse source
This commit is contained in:
oblonski 2014-02-10 18:18:44 +01:00
parent 97fa2a7639
commit db14ea481c
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/AdditionalAccessEgressCalculator.java
View file

@ -44,6 +44,7 @@ class AdditionalAccessEgressCalculator {
delta_access = accessTransportCostNew - accessTransportCostOld; delta_access = accessTransportCostNew - accessTransportCostOld;
if(newVehicle.isReturnToDepot()){
TourActivity lastActivityBeforeEndOfRoute = currentRoute.getActivities().get(currentRoute.getActivities().size()-1); TourActivity lastActivityBeforeEndOfRoute = currentRoute.getActivities().get(currentRoute.getActivities().size()-1);
double lastActivityEndTimeWithOldVehicleAndDepartureTime = lastActivityBeforeEndOfRoute.getEndTime(); double lastActivityEndTimeWithOldVehicleAndDepartureTime = lastActivityBeforeEndOfRoute.getEndTime();
double lastActivityEndTimeEstimationWithNewVehicleAndNewDepartureTime = Math.max(0.0, lastActivityEndTimeWithOldVehicleAndDepartureTime + (newVehicleDepartureTime - currentRoute.getDepartureTime())); double lastActivityEndTimeEstimationWithNewVehicleAndNewDepartureTime = Math.max(0.0, lastActivityEndTimeWithOldVehicleAndDepartureTime + (newVehicleDepartureTime - currentRoute.getDepartureTime()));
@ -52,6 +53,7 @@ class AdditionalAccessEgressCalculator {
delta_egress = egressTransportCostNew - egressTransportCostOld; delta_egress = egressTransportCostNew - egressTransportCostOld;
} }
}
return delta_access + delta_egress; return delta_access + delta_egress;
} }