Changeset 6772 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves

Timestamp:

09/15/11 16:32:43 (13 years ago)

Author:

svonolfe

Message:

Added support for multiple moves in tabu search (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation

Files:

• PotvinCustomerRelocationMove.cs (modified) (2 diffs)
• PotvinCustomerRelocationMoveTabuCriterion.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMove.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -83 +84 @@
     }
 
+    public ITabuMaker GetTabuMaker() {
+      return new PotvinCustomerRelocationMoveTabuMaker();
+    }
+
+    public ITabuChecker GetTabuChecker() {
+      return new PotvinCustomerRelocationMoveTabuCriterion();
+    }
+
+    public ITabuChecker GetSoftTabuChecker() {
+      PotvinCustomerRelocationMoveTabuCriterion tabuChecker = new PotvinCustomerRelocationMoveTabuCriterion();
+      tabuChecker.UseAspirationCriterion.Value = true;
+
+      return tabuChecker;
+    }
+
     #endregion
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveTabuCriterion.cs

@@ -32 +32 @@
   [Item("PotvinCustomerRelocationTabuCriterion", @"Checks if a certain customer relocation move is tabu.")]
   [StorableClass]
-  public class PotvinCustomerRelocationMoveTabuCriterion : SingleSuccessorOperator, IPotvinCustomerRelocationMoveOperator, ITabuChecker, IPotvinOperator {
+  public class PotvinCustomerRelocationMoveTabuCriterion : SingleSuccessorOperator, IPotvinCustomerRelocationMoveOperator, ITabuChecker, IPotvinOperator, IVRPMoveOperator {
     public override bool CanChangeName {
       get { return false; }