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

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/MoveEvaluators/VRPMoveEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/MoveEvaluators/VRPMoveEvaluator.cs

@@ -36 +36 @@
     }
 
-    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"]; }
     }
 
@@ -78 +78 @@
     }
 
+    [StorableConstructor]
+    protected VRPMoveEvaluator(bool deserializing) : base(deserializing) { }
+
     protected VRPMoveEvaluator()
       : base() {
-      Parameters.Add(new LookupParameter<IVRPEncoding>("VRPSolution", "The VRP solution."));
+      Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours."));
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of a VRP solution."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveVehiclesUtilized", "The number of vehicles utilized."));
@@ -88 +91 @@
       Parameters.Add(new LookupParameter<DoubleValue>("MoveTardiness", "The tardiness."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The evaluated quality of a move on a VRP solution."));
-      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<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."));
     }