Changeset 3232 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/PreventReaddAndRemovalTranslocationMoveTabuChecker.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/ThreeOpt/PreventReaddAndRemovalTranslocationMoveTabuChecker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/PreventReaddDeleteThreeOptTabuMoveEvaluator.cs) (4 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