Changeset 8784

Timestamp:

10/11/12 09:10:00 (12 years ago)

Author:

svonolfe

Message:

modified dial-a-ride evaluation (#1955)

File:

• branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Operators/DialARideEvaluator.cs (modified) (3 diffs)

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Operators/DialARideEvaluator.cs

@@ -181 +181 @@
                 pickupReady = readyTime[location + depots - 1];
               }
-              leadTimes.Add(time - pickupReady);
+              leadTimes.Add(time - currentServiceTime - pickupReady);
             }
           } else {
@@ -207 +207 @@
       double leadTime = 0;
       if (leadTimes.Count > 0)
-        leadTime = leadTimes.Average();
+        leadTime = leadTimes.Sum();
       eval.Quality += leadTime * LeadTimeFactorParameter.Value.Value;
 
@@ -217 +217 @@
       tourPenalty += penalty;
 
-      (eval as CVRPTWEvaluation).Tardiness += tardiness;
+      //(eval as CVRPTWEvaluation).Tardiness += tardiness;
       (eval as CVRPTWEvaluation).TravelTime += time;
 
-      penalty = tardiness;
-      eval.Penalty += penalty;
-      eval.Quality += penalty;
-      tourPenalty += penalty;
+      //penalty = tardiness;
+      //eval.Penalty += penalty;
+      eval.Quality += tardiness;
+      //tourPenalty += penalty;
 
       (eval as CVRPPDTWEvaluation).PickupViolations += pickupViolations;