Changeset 3232 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveTabuMaker.cs

Timestamp:

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

Author:

abeham

Message:

Renamed operators according to the underlying operation #889

File:

• trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveTabuMaker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/TwoOptTabuMoveMaker.cs) (2 diffs)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveTabuMaker.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("TwoOptTabuMoveMaker", "Declares a given 2-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("InversionMoveTabuMaker", "Declares a given inversion move (2-opt) as tabu, by adding its attributes to the tabu list.")]
   [StorableClass]
-  public class TwoOptTabuMoveMaker : TabuMoveMaker, ITwoOptPermutationMoveOperator {
+  public class InversionMoveTabuMaker : TabuMaker, IPermutationInversionMoveOperator {
     public override bool CanChangeName {
       get { return false; }
@@ -38 +38 @@
       get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }
-    public ILookupParameter<TwoOptMove> TwoOptMoveParameter {
-      get { return (LookupParameter<TwoOptMove>)Parameters["TwoOptMove"]; }
+    public ILookupParameter<InversionMove> InversionMoveParameter {
+      get { return (LookupParameter<InversionMove>)Parameters["InversionMove"]; }
     }
 
-    public TwoOptTabuMoveMaker()
+    public InversionMoveTabuMaker()
       : base() {
-      Parameters.Add(new LookupParameter<TwoOptMove>("TwoOptMove", "The move that was made."));
+      Parameters.Add(new LookupParameter<InversionMove>("InversionMove", "The move that was made."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
     }
 
     protected override IItem GetTabuAttribute() {
-      TwoOptMove move = TwoOptMoveParameter.ActualValue;
+      InversionMove move = InversionMoveParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
-      return new TwoOptTabuMoveAttribute( permutation.GetCircular(move.Index1 - 1),
+      return new InversionMoveAttribute( permutation.GetCircular(move.Index1 - 1),
         permutation[move.Index1],
         permutation[move.Index2],