Changeset 7865 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMove.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)
• PotvinTwoOptStarMove.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/OnePointCrossover/PotvinOnePointCrossoverMove.cs) (5 diffs)

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

@@ -31 +31 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
-  [Item("PotvinOnePointCrossoverMove", "Item that describes a relocation move on a VRP representation.")]
+  [Item("PotvinTwoOptStarMove", "Item that describes a two opt star move on a VRP representation.")]
   [StorableClass]
-  public class PotvinOnePointCrossoverMove: Item, IVRPMove {
+  public class PotvinTwoOptStarMove: Item, IVRPMove {
     [Storable]
     public IVRPEncoding Individual { get; protected set; }
@@ -49 +49 @@
     public int X2 { get; protected set; }
    
-    public PotvinOnePointCrossoverMove(): base() {
+    public PotvinTwoOptStarMove(): base() {
       X1 = -1;
       Tour1 = -1;
@@ -58 +58 @@
     }
 
-    public PotvinOnePointCrossoverMove(int tour1, int x1, int tour2, int x2, PotvinEncoding individual) {
+    public PotvinTwoOptStarMove(int tour1, int x1, int tour2, int x2, PotvinEncoding individual) {
       Tour1 = tour1;
       X1 = x1;
@@ -68 +68 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new PotvinOnePointCrossoverMove(this, cloner);
+      return new PotvinTwoOptStarMove(this, cloner);
     }
 
-    protected PotvinOnePointCrossoverMove(PotvinOnePointCrossoverMove original, Cloner cloner)
+    protected PotvinTwoOptStarMove(PotvinTwoOptStarMove original, Cloner cloner)
       : base(original, cloner) {
       this.Tour1 = original.Tour1;
@@ -84 +84 @@
 
     public VRPMoveEvaluator GetMoveEvaluator() {
-      return new PotvinOnePointCrossoverMoveEvaluator();
+      return new PotvinTwoOptStarMoveEvaluator();
     }
 
     public VRPMoveMaker GetMoveMaker() {
-      return new PotvinOnePointCrossoverMoveMaker();
+      return new PotvinTwoOptStarMoveMaker();
     }
 
     public ITabuMaker GetTabuMaker() {
-      return new PotvinOnePointCrossoverMoveTabuMaker();
+      return new PotvinTwoOptStarMoveTabuMaker();
     }
 
     public ITabuChecker GetTabuChecker() {
-      return new PotvinOnePointCrossoverMoveTabuCriterion();
+      return new PotvinTwoOptStarMoveTabuCriterion();
     }
 
     public ITabuChecker GetSoftTabuChecker() {
-      PotvinOnePointCrossoverMoveTabuCriterion tabuChecker = new PotvinOnePointCrossoverMoveTabuCriterion();
+      PotvinTwoOptStarMoveTabuCriterion tabuChecker = new PotvinTwoOptStarMoveTabuCriterion();
       tabuChecker.UseAspirationCriterion.Value = true;