Changeset 6711 for branches/VRP

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

Files:

• Analyzer/ConstraintRelaxation (added)
• Analyzer/ConstraintRelaxation/Capacitated (added)
• Analyzer/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs (added)
• Analyzer/ConstraintRelaxation/PickupAndDelivery (added)
• Analyzer/ConstraintRelaxation/PickupAndDelivery/PickupViolationsRelaxationVRPAnalyzer.cs (added)
• Analyzer/ConstraintRelaxation/TimeWindowed (added)
• Analyzer/ConstraintRelaxation/TimeWindowed/TimeWindowRelaxationVRPAnalyzer.cs (added)
• HeuristicLab.Problems.VehicleRouting-3.4.csproj (modified) (1 diff)
• ProblemInstances/SingleDepotVRP/CVRP/CVRPProblemInstance.cs (modified) (3 diffs)
• ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWProblemInstance.cs (modified) (3 diffs)
• ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs (modified) (3 diffs)
• ProblemInstances/VRPProblemInstance.cs (modified) (3 diffs)
• Variants/Capacitated/ICapacitatedProblemInstance.cs (modified) (1 diff)
• Variants/PickupAndDelivery/IPickupAndDeliveryProblemInstance.cs (modified) (1 diff)
• Variants/TimeWindowed/ITimeWindowedProblemInstance.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

@@ -123 +123 @@
     <Compile Include="Analyzer\BestSolution\PickupAndDelivery\BestPickupAndDeliveryVRPSolutionAnalyzer.cs" />
     <Compile Include="Analyzer\BestSolution\TimeWindowed\BestTimeWindowedVRPSolutionAnalyzer.cs" />
+    <Compile Include="Analyzer\ConstraintRelaxation\Capacitated\CapacityRelaxationVRPAnalyzer.cs" />
+    <Compile Include="Analyzer\ConstraintRelaxation\PickupAndDelivery\PickupViolationsRelaxationVRPAnalyzer.cs" />
+    <Compile Include="Analyzer\ConstraintRelaxation\TimeWindowed\TimeWindowRelaxationVRPAnalyzer.cs" />
     <Compile Include="Analyzer\VRPSolution.cs" />
     <Compile Include="Encodings\Alba\AlbaEncoding.cs" />

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;
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -37 +37 @@
   [Item("VRPProblemInstance", "Represents a VRP instance.")]
   [StorableClass]
-  public abstract class VRPProblemInstance: ParameterizedNamedItem, IVRPProblemInstance {
+  public abstract class VRPProblemInstance : ParameterizedNamedItem, IVRPProblemInstance, IStatefulItem {
     public IValueParameter<IVRPEvaluator> EvaluatorParameter {
       get { return (ValueParameter<IVRPEvaluator>)Parameters["Evaluator"]; } 
@@ -273 +273 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserializationHook() {
-      #region Backwards Compatibility
-      if (!Parameters.ContainsKey("BestKnownSolution")) {
-        Parameters.Add(new OptionalValueParameter<VRPSolution>("BestKnownSolution", "The best known solution of this TSP instance."));
-      }
-      if (!Parameters.ContainsKey("BestKnownQuality")) {
-        Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this VRP instance."));
-      }
-      #endregion
-
       AttachEventHandlers();
     }
@@ -302 +293 @@
     }
 
+    public virtual void InitializeState() {
+    }
+
+    public virtual void ClearState() {
+    }
+
     #region Event handlers
     void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/Capacitated/ICapacitatedProblemInstance.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.VehicleRouting.Variants {
   public interface ICapacitatedProblemInstance: IVRPProblemInstance {
-    DoubleValue OverloadPenalty { get; }
+    DoubleValue OverloadPenalty { get; set; }
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/PickupAndDelivery/IPickupAndDeliveryProblemInstance.cs

@@ -30 +30 @@
   public interface IPickupAndDeliveryProblemInstance: IVRPProblemInstance {
     IntArray PickupDeliveryLocation { get; }
-    DoubleValue PickupViolationPenalty { get; }
+    DoubleValue PickupViolationPenalty { get; set; }
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/TimeWindowed/ITimeWindowedProblemInstance.cs

@@ -33 +33 @@
     DoubleArray ServiceTime { get; }
     DoubleValue TimeFactor { get; }
-    DoubleValue TardinessPenalty { get; }
+    DoubleValue TardinessPenalty { get; set; }
   }
 }