Changeset 4179 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators

Timestamp:

08/09/10 18:08:14 (14 years ago)

Author:

svonolfe

Message:

Refactored VRP based on the code review (#1039)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs

@@ -62 +62 @@
     }
 
-    public ILookupParameter<IVRPEncoding> VRPSolutionParameter {
-      get { return (ILookupParameter<IVRPEncoding>)Parameters["VRPSolution"]; }
+    public ILookupParameter<IVRPEncoding> VRPToursParameter {
+      get { return (ILookupParameter<IVRPEncoding>)Parameters["VRPTours"]; }
     }
    
     public ILookupParameter<DoubleValue> FleetUsageFactor {
-      get { return (ILookupParameter<DoubleValue>)Parameters["FleetUsageFactor"]; }
+      get { return (ILookupParameter<DoubleValue>)Parameters["EvalFleetUsageFactor"]; }
     }
     public ILookupParameter<DoubleValue> TimeFactor {
-      get { return (ILookupParameter<DoubleValue>)Parameters["TimeFactor"]; }
+      get { return (ILookupParameter<DoubleValue>)Parameters["EvalTimeFactor"]; }
     }
     public ILookupParameter<DoubleValue> DistanceFactor {
-      get { return (ILookupParameter<DoubleValue>)Parameters["DistanceFactor"]; }
+      get { return (ILookupParameter<DoubleValue>)Parameters["EvalDistanceFactor"]; }
     }
     public ILookupParameter<DoubleValue> OverloadPenalty {
-      get { return (ILookupParameter<DoubleValue>)Parameters["OverloadPenalty"]; }
+      get { return (ILookupParameter<DoubleValue>)Parameters["EvalOverloadPenalty"]; }
     }
     public ILookupParameter<DoubleValue> TardinessPenalty {
-      get { return (ILookupParameter<DoubleValue>)Parameters["TardinessPenalty"]; }
+      get { return (ILookupParameter<DoubleValue>)Parameters["EvalTardinessPenalty"]; }
     }
 
@@ -90 +90 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Overload", "The overload."));
       Parameters.Add(new LookupParameter<DoubleValue>("Tardiness", "The tardiness."));
-      Parameters.Add(new LookupParameter<IVRPEncoding>("VRPSolution", "The VRP solution which should be evaluated."));
-      Parameters.Add(new LookupParameter<DoubleValue>("FleetUsageFactor", "The fleet usage factor considered in the evaluation."));
-      Parameters.Add(new LookupParameter<DoubleValue>("TimeFactor", "The time factor considered in the evaluation."));
-      Parameters.Add(new LookupParameter<DoubleValue>("DistanceFactor", "The distance factor considered in the evaluation."));
-      Parameters.Add(new LookupParameter<DoubleValue>("OverloadPenalty", "The overload penalty considered in the evaluation."));
-      Parameters.Add(new LookupParameter<DoubleValue>("TardinessPenalty", "The tardiness penalty considered in the evaluation."));
+      Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours which should be evaluated."));
+      Parameters.Add(new LookupParameter<DoubleValue>("EvalFleetUsageFactor", "The fleet usage factor considered in the evaluation."));
+      Parameters.Add(new LookupParameter<DoubleValue>("EvalTimeFactor", "The time factor considered in the evaluation."));
+      Parameters.Add(new LookupParameter<DoubleValue>("EvalDistanceFactor", "The distance factor considered in the evaluation."));
+      Parameters.Add(new LookupParameter<DoubleValue>("EvalOverloadPenalty", "The overload penalty considered in the evaluation."));
+      Parameters.Add(new LookupParameter<DoubleValue>("EvalTardinessPenalty", "The tardiness penalty considered in the evaluation."));
     }
 
     private double CalculateFleetUsage() {
-      IVRPEncoding vrpSolution = VRPSolutionParameter.ActualValue;
+      IVRPEncoding vrpSolution = VRPToursParameter.ActualValue;
 
       return vrpSolution.Tours.Count;
@@ -206 +206 @@
 
     public sealed override IOperation Apply() {
-      IVRPEncoding solution = VRPSolutionParameter.ActualValue;
+      IVRPEncoding solution = VRPToursParameter.ActualValue;
 
       TourEvaluation sumEval = Evaluate(solution, DueTimeParameter.ActualValue, ServiceTimeParameter.ActualValue, ReadyTimeParameter.ActualValue,