Changeset 7865 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveTabuCriterion.cs

Timestamp:

05/22/12 09:53:07 (12 years ago)

Author:

svonolfe

Message:

Fixed naming of moves (#1177)

Location:

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

Files:

• . (added)
• PotvinTwoOptStarMoveTabuCriterion.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/OnePointCrossover/PotvinOnePointCrossoverMoveTabuCriterion.cs) (4 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveTabuCriterion.cs

@@ -32 +32 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
-  [Item("PotvinOnePointCrossoverTabuCriterion", @"Checks if a certain customer relocation move is tabu.")]
+  [Item("PotvinTwoOptStarTabuCriterion", @"Checks if a certain two opt star move is tabu.")]
   [StorableClass]
-  public class PotvinOnePointCrossoverMoveTabuCriterion : SingleSuccessorOperator, IPotvinOnePointCrossoverMoveOperator, ITabuChecker, IPotvinOperator, IVRPMoveOperator {
+  public class PotvinTwoOptStarMoveTabuCriterion : SingleSuccessorOperator, IPotvinTwoOptStarMoveOperator, ITabuChecker, IPotvinOperator, IVRPMoveOperator {
     public override bool CanChangeName {
       get { return false; }
     }
 
-    public ILookupParameter<PotvinOnePointCrossoverMove> OnePointCrossoverMoveParameter {
-      get { return (ILookupParameter<PotvinOnePointCrossoverMove>)Parameters["PotvinOnePointCrossoverMove"]; }
+    public ILookupParameter<PotvinTwoOptStarMove> TwoOptStarMoveParameter {
+      get { return (ILookupParameter<PotvinTwoOptStarMove>)Parameters["PotvinTwoOptStarMove"]; }
     }
     public ILookupParameter VRPMoveParameter {
-      get { return OnePointCrossoverMoveParameter; }
+      get { return TwoOptStarMoveParameter; }
     }
     public ILookupParameter<IVRPEncoding> VRPToursParameter {
@@ -84 +84 @@
 
     [StorableConstructor]
-    protected PotvinOnePointCrossoverMoveTabuCriterion(bool deserializing) : base(deserializing) { }
-    protected PotvinOnePointCrossoverMoveTabuCriterion(PotvinOnePointCrossoverMoveTabuCriterion original, Cloner cloner) : base(original, cloner) { }
-    public PotvinOnePointCrossoverMoveTabuCriterion()
+    protected PotvinTwoOptStarMoveTabuCriterion(bool deserializing) : base(deserializing) { }
+    protected PotvinTwoOptStarMoveTabuCriterion(PotvinTwoOptStarMoveTabuCriterion original, Cloner cloner) : base(original, cloner) { }
+    public PotvinTwoOptStarMoveTabuCriterion()
       : base() {
-      Parameters.Add(new LookupParameter<PotvinOnePointCrossoverMove>("PotvinOnePointCrossoverMove", "The moves that should be made."));
+      Parameters.Add(new LookupParameter<PotvinTwoOptStarMove>("PotvinTwoOptStarMove", "The moves that should be made."));
       Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours considered in the move."));
       Parameters.Add(new LookupParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance"));
@@ -104 +104 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new PotvinOnePointCrossoverMoveTabuCriterion(this, cloner);
+      return new PotvinTwoOptStarMoveTabuCriterion(this, cloner);
     }
 
@@ -112 +112 @@
       bool useAspiration = UseAspirationCriterion.Value;
       bool isTabu = false;
-      PotvinOnePointCrossoverMove move = OnePointCrossoverMoveParameter.ActualValue;
+      PotvinTwoOptStarMove move = TwoOptStarMoveParameter.ActualValue;
 
       List<int> segmentX1;
       List<int> segmentX2;
-      PotvinOnePointCrossoverMoveMaker.GetSegments(move, out segmentX1, out segmentX2);
+      PotvinTwoOptStarMoveMaker.GetSegments(move, out segmentX1, out segmentX2);
 
       foreach (IItem tabuMove in tabuList) {
-        PotvinOnePointCrossoverMoveAttribute attribute = tabuMove as PotvinOnePointCrossoverMoveAttribute;
+        PotvinTwoOptStarMoveAttribute attribute = tabuMove as PotvinTwoOptStarMoveAttribute;
 
         if (attribute != null) {