Changeset 7864 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs

Timestamp:

05/22/12 09:38:54 (12 years ago)

Author:

svonolfe

Message:

Moved adaptive penalties to parameter values (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs (modified) (5 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs

@@ -72 +72 @@
     }
 
-    [Storable]
-    private DoubleValue currentTardinessPenalty;
+    protected IValueParameter<DoubleValue> CurrentTardinessPenaltyParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters["CurrentTardinessPenalty"]; }
+    }
 
     public DoubleValue TardinessPenalty {
       get {
+        DoubleValue currentTardinessPenalty = CurrentTardinessPenaltyParameter.Value;
         if (currentTardinessPenalty != null)
           return currentTardinessPenalty;
@@ -82 +84 @@
           return TardinessPenaltyParameter.Value;
       }
-      set { currentTardinessPenalty = value; }
+      set { CurrentTardinessPenaltyParameter.Value = value; }
     }
 
@@ -112 +114 @@
       Parameters.Add(new ValueParameter<DoubleValue>("EvalTimeFactor", "The time factor considered in the evaluation.", new DoubleValue(0)));
       Parameters.Add(new ValueParameter<DoubleValue>("EvalTardinessPenalty", "The tardiness penalty considered in the evaluation.", new DoubleValue(100)));
+      Parameters.Add(new OptionalValueParameter<DoubleValue>("CurrentTardinessPenalty", "The current tardiness penalty considered in the evaluation."));
 
       AttachEventHandlers();
@@ -122 +125 @@
     protected CVRPTWProblemInstance(CVRPTWProblemInstance original, Cloner cloner)
       : base(original, cloner) {
-        currentTardinessPenalty = cloner.Clone(original.currentTardinessPenalty) as DoubleValue;
-
         AttachEventHandlers();
     }
@@ -142 +143 @@
       base.InitializeState();
 
-      currentTardinessPenalty = null;
+      CurrentTardinessPenaltyParameter.Value = null;
     }