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

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/CVRPPDTW/CVRPPDTWProblemInstance.cs (modified) (5 diffs)

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

@@ -50 +50 @@
     }
 
-    [Storable]
-    private DoubleValue currentPickupViolationPenalty;
+    protected IValueParameter<DoubleValue> CurrentPickupViolationPenaltyParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters["CurrentPickupViolationPenalty"]; }
+    }
 
     public DoubleValue PickupViolationPenalty {
       get {
+        DoubleValue currentPickupViolationPenalty = CurrentPickupViolationPenaltyParameter.Value;
         if (currentPickupViolationPenalty != null)
           return currentPickupViolationPenalty;
@@ -60 +62 @@
           return PickupViolationPenaltyParameter.Value;
       }
-      set { currentPickupViolationPenalty = value; }
+      set { CurrentPickupViolationPenaltyParameter.Value = value; }
     }
 
@@ -93 +95 @@
 
       Parameters.Add(new ValueParameter<DoubleValue>("EvalPickupViolationPenalty", "The pickup violation penalty considered in the evaluation.", new DoubleValue(100)));
+      Parameters.Add(new OptionalValueParameter<DoubleValue>("CurrentPickupViolationPenalty", "The current pickup violation penalty considered in the evaluation."));
 
       AttachEventHandlers();
@@ -103 +106 @@
     protected CVRPPDTWProblemInstance(CVRPPDTWProblemInstance original, Cloner cloner)
       : base(original, cloner) {
-        currentPickupViolationPenalty = cloner.Clone(original.currentPickupViolationPenalty) as DoubleValue;
-
         AttachEventHandlers();
     }
@@ -120 +121 @@
       base.InitializeState();
 
-      currentPickupViolationPenalty = null;
+      CurrentPickupViolationPenaltyParameter.Value = null;
     }