Changeset 6711 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP

Timestamp:

09/06/11 14:57:26 (13 years ago)

Author:

svonolfe

Message:

Added adaptive constraint relaxation for all VRP variants (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP

Files:

• CVRPProblemInstance.cs (modified) (3 diffs)
• CVRPTW/CVRPPDTW/CVRPPDTWProblemInstance.cs (modified) (3 diffs)
• CVRPTW/CVRPTWProblemInstance.cs (modified) (3 diffs)

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

@@ -49 +49 @@
       set { CapacityParameter.Value = value; }
     }
+
+    [Storable]
+    private DoubleValue currentOverloadPenalty;
+
     public DoubleValue OverloadPenalty {
-      get { return OverloadPenaltyParameter.Value; }
-      set { OverloadPenaltyParameter.Value = value; }
+      get {
+        if (currentOverloadPenalty != null)
+          return currentOverloadPenalty;
+        else
+          return OverloadPenaltyParameter.Value; }
+      set { currentOverloadPenalty = value; }
     }
 
@@ -87 +95 @@
     protected CVRPProblemInstance(CVRPProblemInstance original, Cloner cloner)
       : base(original, cloner) {
+        currentOverloadPenalty = cloner.Clone(original.currentOverloadPenalty) as DoubleValue;
+
         AttachEventHandlers();
     }
@@ -100 +110 @@
       OverloadPenaltyParameter.ValueChanged += new EventHandler(OverloadPenaltyParameter_ValueChanged);
       OverloadPenaltyParameter.Value.ValueChanged += new EventHandler(OverloadPenalty_ValueChanged);
+    }
+
+    public override void InitializeState() {
+      base.InitializeState();
+
+      currentOverloadPenalty = null;
     }
 

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

@@ -50 +50 @@
     }
 
+    [Storable]
+    private DoubleValue currentPickupViolationPenalty;
+
     public DoubleValue PickupViolationPenalty {
-      get { return PickupViolationPenaltyParameter.Value; }
-      set { PickupViolationPenaltyParameter.Value = value; }
+      get {
+        if (currentPickupViolationPenalty != null)
+          return currentPickupViolationPenalty;
+        else
+          return PickupViolationPenaltyParameter.Value;
+      }
+      set { currentPickupViolationPenalty = value; }
     }
 
@@ -90 +98 @@
     protected CVRPPDTWProblemInstance(CVRPPDTWProblemInstance original, Cloner cloner)
       : base(original, cloner) {
+        currentPickupViolationPenalty = cloner.Clone(original.currentPickupViolationPenalty) as DoubleValue;
+
         AttachEventHandlers();
     }
@@ -100 +110 @@
     private void AttachEventHandlers() {
       PickupDeliveryLocationParameter.ValueChanged += new EventHandler(PickupDeliveryLocationParameter_ValueChanged);
+    }
+
+    public override void InitializeState() {
+      base.InitializeState();
+
+      currentPickupViolationPenalty = null;
     }
 

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

@@ -71 +71 @@
       set { TimeFactorParameter.Value = value; }
     }
+
+    [Storable]
+    private DoubleValue currentTardinessPenalty;
+
     public DoubleValue TardinessPenalty {
-      get { return TardinessPenaltyParameter.Value; }
-      set { TardinessPenaltyParameter.Value = value; }
+      get {
+        if (currentTardinessPenalty != null)
+          return currentTardinessPenalty;
+        else
+          return TardinessPenaltyParameter.Value;
+      }
+      set { currentTardinessPenalty = value; }
     }
 
@@ -113 +122 @@
     protected CVRPTWProblemInstance(CVRPTWProblemInstance original, Cloner cloner)
       : base(original, cloner) {
+        currentTardinessPenalty = cloner.Clone(original.currentTardinessPenalty) as DoubleValue;
+
         AttachEventHandlers();
     }
@@ -126 +137 @@
       TimeFactorParameter.ValueChanged += new EventHandler(TimeFactorParameter_ValueChanged);
       TimeFactorParameter.Value.ValueChanged += new EventHandler(TimeFactor_ValueChanged);
+    }
+
+    public override void InitializeState() {
+      base.InitializeState();
+
+      currentTardinessPenalty = null;
     }