Cost calculator correction & solution analyser infos getter

braktar · braktar · commit 2344365d89b4 · 2016-04-29T13:04:56.000+02:00
diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java
@@ -632,9 +632,11 @@ public double getCosts(VehicleRoutingProblemSolution solution) {
                     TourActivity prevAct = route.getStart();
                     for (TourActivity act : route.getActivities()) {
                         if (act instanceof BreakActivity) hasBreak = true;
-                        costs += setupCosts.getSetupCost(prevAct, act, route.getVehicle());
+                        double setupTime = setupCosts.getSetupTime(prevAct, act, route.getVehicle());
+                        double actReadyTime = act.getArrTime() + setupTime;
+                        costs += setupCosts.getSetupCost(setupTime, route.getVehicle());
                         costs += vrp.getTransportCosts().getTransportCost(prevAct.getLocation(), act.getLocation(), prevAct.getEndTime(), route.getDriver(), route.getVehicle());
-                        costs += vrp.getActivityCosts().getActivityCost(act, act.getArrTime(), route.getDriver(), route.getVehicle());
+                        costs += vrp.getActivityCosts().getActivityCost(act, actReadyTime, route.getDriver(), route.getVehicle());
                         prevAct = act;
                     }
                     costs += vrp.getTransportCosts().getTransportCost(prevAct.getLocation(), route.getEnd().getLocation(), prevAct.getEndTime(), route.getDriver(), route.getVehicle());
diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java
@@ -63,11 +63,11 @@ public double getCosts(JobInsertionContext iFacts, TourActivity prevAct, TourAct
 
         double oldCosts;
         if (iFacts.getRoute().isEmpty()) {
-        	double tp_costs_prevAct_nextAct = routingCosts.getTransportCost(prevAct.getLocation(), nextAct.getLocation(), depTimeAtPrevAct, iFacts.getNewDriver(), iFacts.getNewVehicle());
+            double setup_costs_prevAct_nextAct = setupCosts.getSetupCost(prevAct, nextAct, iFacts.getNewVehicle());
+            double tp_costs_prevAct_nextAct = setup_costs_prevAct_nextAct + routingCosts.getTransportCost(prevAct.getLocation(), nextAct.getLocation(), depTimeAtPrevAct, iFacts.getNewDriver(), iFacts.getNewVehicle());
             oldCosts = tp_costs_prevAct_nextAct;
         } else {
-            double setup_time_prevAct_nextAct = setupCosts.getSetupTime(prevAct, nextAct, iFacts.getNewVehicle());
-            double setup_costs_prevAct_nextAct = setupCosts.getSetupCost(setup_time_prevAct_nextAct, iFacts.getNewVehicle());
+            double setup_costs_prevAct_nextAct = setupCosts.getSetupCost(prevAct, nextAct, iFacts.getNewVehicle());
             double tp_costs_prevAct_nextAct = setup_costs_prevAct_nextAct + routingCosts.getTransportCost(prevAct.getLocation(), nextAct.getLocation(), prevAct.getEndTime(), iFacts.getRoute().getDriver(), iFacts.getRoute().getVehicle());
             oldCosts = tp_costs_prevAct_nextAct;
         }
diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCosts.java
@@ -90,8 +90,10 @@ public void visit(TourActivity act) {
         timeTracker.visit(act);
 
         double transportCost = this.transportCost.getTransportCost(prevAct.getLocation(), act.getLocation(), startTimeAtPrevAct, vehicleRoute.getDriver(), vehicleRoute.getVehicle());
+        double setupTime = setupCosts.getSetupTime(prevAct, act, vehicleRoute.getVehicle());
         double setupCost = setupCosts.getSetupCost(prevAct, act, vehicleRoute.getVehicle());
-        double actCost = activityCost.getActivityCost(act, timeTracker.getActArrTime(), vehicleRoute.getDriver(), vehicleRoute.getVehicle());
+        double actReadyTime = timeTracker.getActArrTime() + setupTime;
+        double actCost = activityCost.getActivityCost(act, actReadyTime, vehicleRoute.getDriver(), vehicleRoute.getVehicle());
 
         totalOperationCost += transportCost;
         totalOperationCost += setupCost;
diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java
@@ -223,6 +223,8 @@ private static class SumUpActivityTimes implements StateUpdater, ActivityVisitor
 
         private StateId too_late_id;
 
+        private StateId setup_time_id;
+
         private StateManager stateManager;
 
         private final VehicleRoutingActivityCosts activityCosts;
@@ -239,13 +241,20 @@ private static class SumUpActivityTimes implements StateUpdater, ActivityVisitor
 
         double sum_too_late = 0.;
 
+        double sum_setup_time = 0.;
+
+        TourActivity prevAct;
+
         double prevActDeparture;
 
-        private SumUpActivityTimes(StateId waiting_time_id, StateId transport_time_id, StateId service_time_id, StateId too_late_id, StateManager stateManager, ActivityTimeTracker.ActivityPolicy activityPolicy, VehicleRoutingActivityCosts activityCosts) {
+        private SetupTime setupCosts = new SetupTime();
+
+        private SumUpActivityTimes(StateId waiting_time_id, StateId transport_time_id, StateId service_time_id, StateId too_late_id, StateId setup_time_id, StateManager stateManager, ActivityTimeTracker.ActivityPolicy activityPolicy, VehicleRoutingActivityCosts activityCosts) {
             this.waiting_time_id = waiting_time_id;
             this.transport_time_id = transport_time_id;
             this.service_time_id = service_time_id;
             this.too_late_id = too_late_id;
+            this.setup_time_id = setup_time_id;
             this.stateManager = stateManager;
             this.activityPolicy = activityPolicy;
             this.activityCosts = activityCosts;
@@ -258,6 +267,8 @@ public void begin(VehicleRoute route) {
             sum_transport_time = 0.;
             sum_service_time = 0.;
             sum_too_late = 0.;
+            sum_setup_time = 0.;
+            prevAct = route.getStart();
             prevActDeparture = route.getDepartureTime();
         }
 
@@ -266,21 +277,25 @@ public void visit(TourActivity activity) {
             //waiting time & toolate
             double waitAtAct = 0.;
             double tooLate = 0.;
+            double setupTime = setupCosts.getSetupTime(prevAct, activity, route.getVehicle());
+            double actReadyTime = setupTime + activity.getArrTime();
             if (activityPolicy.equals(ActivityTimeTracker.ActivityPolicy.AS_SOON_AS_TIME_WINDOW_OPENS)) {
-                waitAtAct = Math.max(0, activity.getTheoreticalEarliestOperationStartTime() - activity.getArrTime());
-                tooLate = Math.max(0, activity.getArrTime() - activity.getTheoreticalLatestOperationStartTime());
+                waitAtAct = Math.max(0, activity.getTheoreticalEarliestOperationStartTime() - actReadyTime);
+                tooLate = Math.max(0, actReadyTime - activity.getTheoreticalLatestOperationStartTime());
             }
             sum_waiting_time += waitAtAct;
             sum_too_late += tooLate;
             //transport time
             double transportTime = activity.getArrTime() - prevActDeparture;
+
+            sum_setup_time += setupTime;
             sum_transport_time += transportTime;
             prevActDeparture = activity.getEndTime();
             //service time
-            sum_service_time += activityCosts.getActivityDuration(activity, activity.getArrTime(), route.getDriver(), route.getVehicle());
+            sum_service_time += activityCosts.getActivityDuration(activity, actReadyTime, route.getDriver(), route.getVehicle());
 
             stateManager.putActivityState(activity, transport_time_id, sum_transport_time);
-
+            prevAct = activity;
         }
 
         @Override
@@ -291,6 +306,7 @@ public void finish() {
             stateManager.putRouteState(route, waiting_time_id, sum_waiting_time);
             stateManager.putRouteState(route, service_time_id, sum_service_time);
             stateManager.putRouteState(route, too_late_id, sum_too_late);
+            stateManager.putRouteState(route, setup_time_id, sum_setup_time);
         }
     }
 
@@ -454,6 +470,8 @@ public void finish() {
 
     private StateId service_time_id;
 
+    private StateId setup_time_id;
+
     private StateId distance_id;
 
     private StateId too_late_id;
@@ -480,6 +498,7 @@ public void finish() {
     private Double waiting_time;
     private Double service_time;
     private Double operation_time;
+    private Double setup_time;
     private Double tw_violation;
     private Capacity cap_violation;
     private Double fixed_costs;
@@ -538,6 +557,7 @@ private void initialise() {
         waiting_time_id = stateManager.createStateId("waiting-time");
         transport_time_id = stateManager.createStateId("transport-time");
         service_time_id = stateManager.createStateId("service-time");
+        setup_time_id = stateManager.createStateId("setup_time");
         distance_id = stateManager.createStateId("distance");
         too_late_id = stateManager.createStateId("too-late");
         shipment_id = stateManager.createStateId("shipment");
@@ -547,7 +567,7 @@ private void initialise() {
         last_transport_distance_id = stateManager.createStateId("last-transport-distance");
         last_transport_time_id = stateManager.createStateId("last-transport-time");
 
-        stateManager.addStateUpdater(new SumUpActivityTimes(waiting_time_id, transport_time_id, service_time_id, too_late_id, stateManager, activityPolicy, vrp.getActivityCosts()));
+        stateManager.addStateUpdater(new SumUpActivityTimes(waiting_time_id, transport_time_id, service_time_id, too_late_id, setup_time_id, stateManager, activityPolicy, vrp.getActivityCosts()));
         stateManager.addStateUpdater(new DistanceUpdater(distance_id, stateManager, distanceCalculator));
         stateManager.addStateUpdater(new BackhaulAndShipmentUpdater(backhaul_id, shipment_id, stateManager));
         stateManager.addStateUpdater(new SkillUpdater(stateManager, skill_id));
@@ -571,6 +591,7 @@ private void recalculateSolutionIndicators() {
             waiting_time += getWaitingTime(route);
             service_time += getServiceTime(route);
             operation_time += getOperationTime(route);
+            setup_time += getSetupTime(route);
             tw_violation += getTimeWindowViolation(route);
             cap_violation = Capacity.addup(cap_violation, getCapacityViolation(route));
             fixed_costs += getFixedCosts(route);
@@ -597,6 +618,7 @@ private void clearSolutionIndicators() {
         waiting_time = 0.;
         service_time = 0.;
         operation_time = 0.;
+        setup_time = 0.;
         tw_violation = 0.;
         cap_violation = Capacity.Builder.newInstance().build();
         fixed_costs = 0.;
@@ -920,6 +942,11 @@ public Double getServiceTime(VehicleRoute route) {
         return stateManager.getRouteState(route, service_time_id, Double.class);
     }
 
+    public Double getSetupTime(VehicleRoute route) {
+        if (route == null) throw new IllegalArgumentException("route is missing.");
+        return stateManager.getRouteState(route, setup_time_id, Double.class);
+    }
+
     /**
      * @param route to get the transport costs from
      * @return total variable transport costs of route, i.e. sum of transport costs specified by
@@ -1170,6 +1197,10 @@ public Double getServiceTime() {
         return service_time;
     }
 
+    public Double getSetupTime() {
+        return setup_time;
+    }
+
     /**
      * @return total fixed costs for specified solution
      */
diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ActivityTimeTracker.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ActivityTimeTracker.java
@@ -87,18 +87,18 @@ public void visit(TourActivity activity) {
         if (!beginFirst) throw new IllegalStateException("never called begin. this however is essential here");
         double setup_time_prevAct_activity = setupCosts.getSetupTime(prevAct, activity, route.getVehicle());
         
-        double transportTime = setup_time_prevAct_activity + this.transportTime.getTransportTime(prevAct.getLocation(), activity.getLocation(), startAtPrevAct, route.getDriver(), route.getVehicle());
+        double transportTime = /*setup_time_prevAct_activity + */this.transportTime.getTransportTime(prevAct.getLocation(), activity.getLocation(), startAtPrevAct, route.getDriver(), route.getVehicle());
     
         double arrivalTimeAtCurrAct = startAtPrevAct + transportTime;
-
         actArrTime = arrivalTimeAtCurrAct;
+        double readyTimeAtCurrAct = arrivalTimeAtCurrAct + setup_time_prevAct_activity;
         double operationStartTime;
 
         if (activityPolicy.equals(ActivityPolicy.AS_SOON_AS_TIME_WINDOW_OPENS)) {
-            operationStartTime = Math.max(activity.getTheoreticalEarliestOperationStartTime(), arrivalTimeAtCurrAct);
+            operationStartTime = Math.max(activity.getTheoreticalEarliestOperationStartTime(), readyTimeAtCurrAct);
         } else if (activityPolicy.equals(ActivityPolicy.AS_SOON_AS_ARRIVED)) {
-            operationStartTime = actArrTime;
-        } else operationStartTime = actArrTime;
+            operationStartTime = readyTimeAtCurrAct;
+        } else operationStartTime = readyTimeAtCurrAct;
 
         double operationEndTime = operationStartTime + activityCosts.getActivityDuration(activity,actArrTime,route.getDriver(),route.getVehicle());
 
