Fix BackwardTransportTime

Author: braktar

jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java

@@ -62,9 +62,9 @@ public void visit(TourActivity activity) {
         	coef = route.getVehicle().getCoefSetupTime();
     	double setup_time_activity_prevAct = 0.0;
     	if(!activity.getLocation().equals(prevAct.getLocation()))
-    		setup_time_activity_prevAct = prevAct.getSetupTime() * coef;
+    		setup_time_activity_prevAct = activity.getSetupTime() * coef;
     	double transport_time_activity_prevAct = setup_time_activity_prevAct + transportCosts.getBackwardTransportTime(activity.getLocation(), prevAct.getLocation(), latestArrTimeAtPrevAct, route.getDriver(), route.getVehicle());
-        double potentialLatestArrivalTimeAtCurrAct = latestArrTimeAtPrevAct - transport_time_activity_prevAct  - activityCosts.getActivityDuration(activity,latestArrTimeAtPrevAct,route.getDriver(),route.getVehicle());
+        double potentialLatestArrivalTimeAtCurrAct = latestArrTimeAtPrevAct - transport_time_activity_prevAct - activityCosts.getActivityDuration(activity,latestArrTimeAtPrevAct,route.getDriver(),route.getVehicle());
         double latestArrivalTime = Math.min(activity.getTheoreticalLatestOperationStartTime(), potentialLatestArrivalTimeAtCurrAct);
 
         states.putInternalTypedActivityState(activity, InternalStates.LATEST_OPERATION_START_TIME, latestArrivalTime);

jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java

@@ -107,7 +107,7 @@ public void visit(TourActivity activity) {
             Location prevLocation = location_of_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()];
             double setup_time_activity_prevLocation = 0.0;
             if(!activity.getLocation().equals(prevLocation))
-            	setup_time_activity_prevLocation = setup_time_of_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()] * coef;
+            	setup_time_activity_prevLocation = activity.getSetupTime() * coef;
             double transport_time_activity_prevLocation = setup_time_activity_prevLocation + transportCosts.getBackwardTransportTime(activity.getLocation(), prevLocation,
                     latestArrTimeAtPrevAct, route.getDriver(), vehicle);
             double potentialLatestArrivalTimeAtCurrAct = latestArrTimeAtPrevAct - transport_time_activity_prevLocation - activityCosts.getActivityDuration(activity, latestArrTimeAtPrevAct, route.getDriver(), route.getVehicle());