Changeset 3232 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt

Timestamp:

03/29/10 18:49:55 (14 years ago)

Author:

abeham

Message:

Renamed operators according to the underlying operation #889

Location:

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt

Files:

• ExhaustiveInsertionMoveGenerator.cs (added)
• Insertion (deleted)
• PreventReaddAndRemovalTranslocationMoveTabuChecker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/PreventReaddDeleteThreeOptTabuMoveEvaluator.cs) (4 diffs)
• PreventReaddTranslocationMoveTabuChecker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/PreventReaddThreeOptTabuMoveEvaluator.cs) (4 diffs)
• PreventRemovalTranslocationMoveTabuChecker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/PreventDeleteThreeOptTabuMoveEvaluator.cs) (4 diffs)
• StochasticTranslocationMultiMoveGenerator.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticThreeOptMultiMoveGenerator.cs) (4 diffs)
• StochasticTranslocationSingleMoveGenerator.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticThreeOptSingleMoveGenerator.cs) (3 diffs)
• TranslocationMove.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ThreeOptMove.cs) (1 diff)
• TranslocationMoveAttribute.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ThreeOptTabuMoveAttribute.cs) (3 diffs)
• TranslocationMoveGenerator.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ThreeOptMoveGenerator.cs) (5 diffs)
• TranslocationMoveMaker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ThreeOptMoveMaker.cs) (4 diffs)
• TranslocationMoveTabuMaker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ThreeOptTabuMoveMaker.cs) (3 diffs)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/PreventReaddAndRemovalTranslocationMoveTabuChecker.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("ThreeOptPreventEdgeRemovalAndReadding", "Prevents readding of previously deleted edges as well as deleting previously added edges.")]
+  [Item("PreventReaddAndRemovalTranslocationMoveTabuChecker", "Prevents readding of previously deleted edges as well as deleting previously added edges.")]
   [StorableClass]
-  public class PreventReaddDeleteThreeOptTabuMoveEvaluator : SingleSuccessorOperator, IThreeOptPermutationMoveOperator, ITabuMoveEvaluator {
+  public class PreventReaddAndRemovalTranslocationMoveTabuChecker : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, ITabuChecker {
     public override bool CanChangeName {
       get { return false; }
     }
-    public ILookupParameter<ThreeOptMove> ThreeOptMoveParameter {
-      get { return (LookupParameter<ThreeOptMove>)Parameters["ThreeOptMove"]; }
+    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
+      get { return (LookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }
     }
     public ILookupParameter<Permutation> PermutationParameter {
@@ -51 +51 @@
     }
 
-    public PreventReaddDeleteThreeOptTabuMoveEvaluator()
+    public PreventReaddAndRemovalTranslocationMoveTabuChecker()
       : base() {
-      Parameters.Add(new LookupParameter<ThreeOptMove>("ThreeOptMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<BoolValue>("MoveTabu", "The variable to store if a move was tabu."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
@@ -62 +62 @@
     public override IOperation Apply() {
       ItemList<IItem> tabuList = TabuListParameter.ActualValue;
-      ThreeOptMove move = ThreeOptMoveParameter.ActualValue;
+      TranslocationMove move = TranslocationMoveParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
       int length = permutation.Length;
@@ -83 +83 @@
       if (!isTabu) {
         foreach (IItem tabuMove in tabuList) {
-          ThreeOptTabuMoveAttribute attribute = (tabuMove as ThreeOptTabuMoveAttribute);
+          TranslocationMoveAttribute attribute = (tabuMove as TranslocationMoveAttribute);
           if (attribute != null) {
             // if previously deleted Edge1Source-Target is readded

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/PreventReaddTranslocationMoveTabuChecker.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("ThreeOptPreventEdgeReadding", "Prevents readding of previously deleted edges.")]
+  [Item("PreventReaddTranslocationMoveTabuChecker", "Prevents readding of previously deleted edges.")]
   [StorableClass]
-  public class PreventReaddThreeOptTabuMoveEvaluator : SingleSuccessorOperator, IThreeOptPermutationMoveOperator, ITabuMoveEvaluator {
+  public class PreventReaddTranslocationMoveTabuChecker : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, ITabuChecker {
     public override bool CanChangeName {
       get { return false; }
     }
-    public ILookupParameter<ThreeOptMove> ThreeOptMoveParameter {
-      get { return (LookupParameter<ThreeOptMove>)Parameters["ThreeOptMove"]; }
+    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
+      get { return (LookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }
     }
     public ILookupParameter<Permutation> PermutationParameter {
@@ -51 +51 @@
     }
 
-    public PreventReaddThreeOptTabuMoveEvaluator()
+    public PreventReaddTranslocationMoveTabuChecker()
       : base() {
-      Parameters.Add(new LookupParameter<ThreeOptMove>("ThreeOptMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<BoolValue>("MoveTabu", "The variable to store if a move was tabu."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
@@ -62 +62 @@
     public override IOperation Apply() {
       ItemList<IItem> tabuList = TabuListParameter.ActualValue;
-      ThreeOptMove move = ThreeOptMoveParameter.ActualValue;
+      TranslocationMove move = TranslocationMoveParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
       int length = permutation.Length;
@@ -83 +83 @@
       if (!isTabu) {
         foreach (IItem tabuMove in tabuList) {
-          ThreeOptTabuMoveAttribute attribute = (tabuMove as ThreeOptTabuMoveAttribute);
+          TranslocationMoveAttribute attribute = (tabuMove as TranslocationMoveAttribute);
           if (attribute != null) {
             // if previously deleted Edge1Source-Target is readded

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/PreventRemovalTranslocationMoveTabuChecker.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("ThreeOptPreventEdgeRemoval", "Prevents deleting of previously added edges.")]
+  [Item("PreventRemovalTranslocationMoveTabuChecker", "Prevents deleting of previously added edges.")]
   [StorableClass]
-  public class PreventDeleteThreeOptTabuMoveEvaluator : SingleSuccessorOperator, IThreeOptPermutationMoveOperator, ITabuMoveEvaluator {
+  public class PreventRemovalTranslocationMoveTabuChecker : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, ITabuChecker {
     public override bool CanChangeName {
       get { return false; }
     }
-    public ILookupParameter<ThreeOptMove> ThreeOptMoveParameter {
-      get { return (LookupParameter<ThreeOptMove>)Parameters["ThreeOptMove"]; }
+    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
+      get { return (LookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }
     }
     public ILookupParameter<Permutation> PermutationParameter {
@@ -51 +51 @@
     }
 
-    public PreventDeleteThreeOptTabuMoveEvaluator()
+    public PreventRemovalTranslocationMoveTabuChecker()
       : base() {
-      Parameters.Add(new LookupParameter<ThreeOptMove>("ThreeOptMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<BoolValue>("MoveTabu", "The variable to store if a move was tabu."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
@@ -62 +62 @@
     public override IOperation Apply() {
       ItemList<IItem> tabuList = TabuListParameter.ActualValue;
-      ThreeOptMove move = ThreeOptMoveParameter.ActualValue;
+      TranslocationMove move = TranslocationMoveParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
       int length = permutation.Length;
@@ -83 +83 @@
       if (!isTabu) {
         foreach (IItem tabuMove in tabuList) {
-          ThreeOptTabuMoveAttribute attribute = (tabuMove as ThreeOptTabuMoveAttribute);
+          TranslocationMoveAttribute attribute = (tabuMove as TranslocationMoveAttribute);
           if (attribute != null) {
             // if previously added Edge3Source-Edge1Target is deleted

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationMultiMoveGenerator.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("StochasticThreeOptMultiMoveGenerator", "Randomly samples n from all possible 3-opt moves from a given permutation.")]
+  [Item("StochasticTranslocationMultiMoveGenerator", "Randomly samples n from all possible translocation and insertion moves (3-opt) from a given permutation.")]
   [StorableClass]
-  public class StochasticThreeOptMultiMoveGenerator : ThreeOptMoveGenerator, IStochasticOperator, IMultiMoveGenerator {
+  public class StochasticTranslocationMultiMoveGenerator : TranslocationMoveGenerator, IStochasticOperator, IMultiMoveGenerator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
@@ -43 +43 @@
     }
 
-    public StochasticThreeOptMultiMoveGenerator()
+    public StochasticTranslocationMultiMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
@@ -49 +49 @@
     }
 
-    public static ThreeOptMove[] Apply(Permutation permutation, IRandom random, int sampleSize) {
+    public static TranslocationMove[] Apply(Permutation permutation, IRandom random, int sampleSize) {
       int length = permutation.Length;
-      ThreeOptMove[] moves = new ThreeOptMove[sampleSize];
+      TranslocationMove[] moves = new TranslocationMove[sampleSize];
       for (int i = 0; i < sampleSize; i++) {
         moves[i] = StochasticThreeOptSingleMoveGenerator.Apply(permutation, random);
@@ -58 +58 @@
     }
 
-    protected override ThreeOptMove[] GenerateMoves(Permutation permutation) {
+    protected override TranslocationMove[] GenerateMoves(Permutation permutation) {
       IRandom random = RandomParameter.ActualValue;
       return Apply(permutation, random, SampleSizeParameter.ActualValue.Value);

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationSingleMoveGenerator.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("StochasticThreeOptSingleMoveGenerator", "Randomly samples one from all possible 3-opt moves from a given permutation.")]
+  [Item("StochasticTranslocationSingleMoveGenerator", "Randomly samples one from all possible translocation and insertion moves (3-opt) from a given permutation.")]
   [StorableClass]
-  public class StochasticThreeOptSingleMoveGenerator : ThreeOptMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
+  public class StochasticThreeOptSingleMoveGenerator : TranslocationMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
@@ -40 +40 @@
     }
 
-    public static ThreeOptMove Apply(Permutation permutation, IRandom random) {
+    public static TranslocationMove Apply(Permutation permutation, IRandom random) {
       int length = permutation.Length;
       int index1, index2, index3;
@@ -51 +51 @@
       } while (index3 == index1);
       
-      return new ThreeOptMove(index1, index2, index3);
+      return new TranslocationMove(index1, index2, index3);
     }
 
-    protected override ThreeOptMove[] GenerateMoves(Permutation permutation) {
+    protected override TranslocationMove[] GenerateMoves(Permutation permutation) {
       IRandom random = RandomParameter.ActualValue;
-      return new ThreeOptMove[] { Apply(permutation, random) };
+      return new TranslocationMove[] { Apply(permutation, random) };
     }
   }

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMove.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("ThreeOptMove", "A move that changes three edges by performing a translocation.")]
+  [Item("TranslocationMove", "A move that changes three edges by performing a translocation.")]
   [StorableClass]
-  public class ThreeOptMove : ThreeIndexMove {
-    public ThreeOptMove()
+  public class TranslocationMove : ThreeIndexMove {
+    public TranslocationMove()
       : base() {
     }
 
-    public ThreeOptMove(int index1, int index2, int index3)
+    public TranslocationMove(int index1, int index2, int index3)
       : base(index1, index2, index3, null) {
     }
 
-    public ThreeOptMove(int index1, int index2, int index3, Permutation permutation)
+    public TranslocationMove(int index1, int index2, int index3, Permutation permutation)
       : base(index1, index2, index3, permutation) {
     }

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveAttribute.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("ThreeOptTabuMoveAttribute", "Specifies the tabu attributes for a 3-opt move.")]
+  [Item("TranslocationMoveAttribute", "Specifies the tabu attributes for a translocation and insertion move (3-opt).")]
   [StorableClass]
-  public class ThreeOptTabuMoveAttribute : Item {
+  public class TranslocationMoveAttribute : Item {
     [Storable]
     public int Edge1Source { get; private set; }
@@ -41 +41 @@
 
     [StorableConstructor]
-    private ThreeOptTabuMoveAttribute(bool deserializing)
+    private TranslocationMoveAttribute(bool deserializing)
       : base() {
     }
 
-    public ThreeOptTabuMoveAttribute()
+    public TranslocationMoveAttribute()
       : this(-1, -1, -1, -1, -1, -1) { }
 
-    public ThreeOptTabuMoveAttribute(int edge1Source, int edge1Target, int edge2Source, int edge2Target, int edge3Source, int edge3Target)
+    public TranslocationMoveAttribute(int edge1Source, int edge1Target, int edge2Source, int edge2Target, int edge3Source, int edge3Target)
       : base() {
       Edge1Source = edge1Source;
@@ -59 +59 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      ThreeOptTabuMoveAttribute clone = (ThreeOptTabuMoveAttribute)base.Clone(cloner);
+      TranslocationMoveAttribute clone = (TranslocationMoveAttribute)base.Clone(cloner);
       clone.Edge1Source = Edge1Source;
       clone.Edge1Target = Edge1Target;

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveGenerator.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("ThreeOptMoveGenerator", "Base class for move generators that produce 3-opt moves.")]
+  [Item("TranslocationMoveGenerator", "Base class for move generators that produce translocation moves (3-opt).")]
   [StorableClass]
-  public abstract class ThreeOptMoveGenerator : SingleSuccessorOperator, IThreeOptPermutationMoveOperator, IMoveGenerator {
+  public abstract class TranslocationMoveGenerator : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, IMoveGenerator {
     public override bool CanChangeName {
       get { return false; }
@@ -37 +37 @@
       get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }
-    public ILookupParameter<ThreeOptMove> ThreeOptMoveParameter {
-      get { return (LookupParameter<ThreeOptMove>)Parameters["ThreeOptMove"]; }
+    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
+      get { return (LookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }
     }
     protected ScopeParameter CurrentScopeParameter {
@@ -44 +44 @@
     }
 
-    public ThreeOptMoveGenerator()
+    public TranslocationMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The permutation for which moves should be generated."));
-      Parameters.Add(new LookupParameter<ThreeOptMove>("ThreeOptMove", "The moves that should be generated in subscopes."));
+      Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The moves that should be generated in subscopes."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope where the moves should be added as subscopes."));
     }
@@ -53 +53 @@
     public override IOperation Apply() {
       Permutation p = PermutationParameter.ActualValue;
-      ThreeOptMove[] moves = GenerateMoves(p);
+      TranslocationMove[] moves = GenerateMoves(p);
       Scope[] moveScopes = new Scope[moves.Length];
       for (int i = 0; i < moveScopes.Length; i++) {
         moveScopes[i] = new Scope(i.ToString());
-        moveScopes[i].Variables.Add(new Variable(ThreeOptMoveParameter.ActualName, moves[i]));
+        moveScopes[i].Variables.Add(new Variable(TranslocationMoveParameter.ActualName, moves[i]));
       }
       CurrentScopeParameter.ActualValue.SubScopes.AddRange(moveScopes);
@@ -63 +63 @@
     }
 
-    protected abstract ThreeOptMove[] GenerateMoves(Permutation permutation);
+    protected abstract TranslocationMove[] GenerateMoves(Permutation permutation);
   }
 }

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveMaker.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("ThreeOptMoveMaker", "Peforms a 3-opt move on a given permutation and updates the quality.")]
+  [Item("TranslocationMoveMaker", "Peforms a translocation or insertion move (3-opt) on a given permutation and updates the quality.")]
   [StorableClass]
-  public class ThreeOptMoveMaker : SingleSuccessorOperator, IThreeOptPermutationMoveOperator, IMoveMaker {
+  public class TranslocationMoveMaker : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, IMoveMaker {
     public override bool CanChangeName {
       get { return false; }
@@ -41 +41 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
     }
-    public ILookupParameter<ThreeOptMove> ThreeOptMoveParameter {
-      get { return (ILookupParameter<ThreeOptMove>)Parameters["ThreeOptMove"]; }
+    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
+      get { return (ILookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }
     }
     public ILookupParameter<Permutation> PermutationParameter {
@@ -48 +48 @@
     }
 
-    public ThreeOptMoveMaker()
+    public TranslocationMoveMaker()
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
-      Parameters.Add(new LookupParameter<ThreeOptMove>("ThreeOptMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
@@ -57 +57 @@
 
     public override IOperation Apply() {
-      ThreeOptMove move = ThreeOptMoveParameter.ActualValue;
+      TranslocationMove move = TranslocationMoveParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
       DoubleValue moveQuality = MoveQualityParameter.ActualValue;

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveTabuMaker.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("ThreeOptTabuMoveMaker", "Declares a given 3-opt move as tabu, by adding its attributes to the tabu list. It also removes the oldest entry in the tabu list when its size is greater than tenure.")]
+  [Item("TranslocationMoveTabuMaker", "Declares a given translocation or insertion move (3-opt) as tabu, by adding its attributes to the tabu list.")]
   [StorableClass]
-  public class ThreeOptTabuMoveMaker : TabuMoveMaker, IThreeOptPermutationMoveOperator {
+  public class TranslocationMoveTabuMaker : TabuMaker, IPermutationTranslocationMoveOperator {
     public override bool CanChangeName {
       get { return false; }
@@ -38 +38 @@
       get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }
-    public ILookupParameter<ThreeOptMove> ThreeOptMoveParameter {
-      get { return (LookupParameter<ThreeOptMove>)Parameters["ThreeOptMove"]; }
+    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
+      get { return (LookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }
     }
 
-    public ThreeOptTabuMoveMaker()
+    public TranslocationMoveTabuMaker()
       : base() {
-      Parameters.Add(new LookupParameter<ThreeOptMove>("ThreeOptMove", "The move that was made."));
+      Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The move that was made."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
     }
 
     protected override IItem GetTabuAttribute() {
-      ThreeOptMove move = ThreeOptMoveParameter.ActualValue;
+      TranslocationMove move = TranslocationMoveParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
       if (move.Index3 > move.Index1)
-        return new ThreeOptTabuMoveAttribute(permutation.GetCircular(move.Index1 - 1),
+        return new TranslocationMoveAttribute(permutation.GetCircular(move.Index1 - 1),
         permutation[move.Index1],
         permutation[move.Index2],
@@ -59 +59 @@
         permutation.GetCircular(move.Index3 + move.Index2 - move.Index1 + 1));
       else
-        return new ThreeOptTabuMoveAttribute(permutation.GetCircular(move.Index1 - 1),
+        return new TranslocationMoveAttribute(permutation.GetCircular(move.Index1 - 1),
         permutation[move.Index1],
         permutation[move.Index2],