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

Timestamp:

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

Author:

abeham

Message:

Renamed operators according to the underlying operation #889

File:

• trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/PreventRemovalInversionMoveTabuChecker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/PreventDeleteTwoOptTabuMoveEvaluator.cs) (4 diffs)

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("TwoOptPreventEdgeRemoval", "Prevents deleting of previously added edges.")]
+  [Item("PreventRemovalInversionMoveTabuChecker", "Prevents deleting of previously added edges.")]
   [StorableClass]
-  public class PreventDeleteTwoOptTabuMoveEvaluator : SingleSuccessorOperator, ITwoOptPermutationMoveOperator, ITabuMoveEvaluator {
+  public class PreventRemovalInversionMoveTabuChecker : SingleSuccessorOperator, IPermutationInversionMoveOperator, ITabuChecker {
     public override bool CanChangeName {
       get { return false; }
     }
-    public ILookupParameter<TwoOptMove> TwoOptMoveParameter {
-      get { return (LookupParameter<TwoOptMove>)Parameters["TwoOptMove"]; }
+    public ILookupParameter<InversionMove> InversionMoveParameter {
+      get { return (LookupParameter<InversionMove>)Parameters["InversionMove"]; }
     }
     public ILookupParameter<Permutation> PermutationParameter {
@@ -51 +51 @@
     }
 
-    public PreventDeleteTwoOptTabuMoveEvaluator()
+    public PreventRemovalInversionMoveTabuChecker()
       : base() {
-      Parameters.Add(new LookupParameter<TwoOptMove>("TwoOptMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<InversionMove>("InversionMove", "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;
-      TwoOptMove move = TwoOptMoveParameter.ActualValue;
+      InversionMove move = InversionMoveParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
       int length = permutation.Length;
@@ -72 +72 @@
       if (!isTabu) {
         foreach (IItem tabuMove in tabuList) {
-          TwoOptTabuMoveAttribute attribute = (tabuMove as TwoOptTabuMoveAttribute);
+          InversionMoveAttribute attribute = (tabuMove as InversionMoveAttribute);
           if (attribute != null) {
             // if previously added Edge1Source-Edge2Source is deleted