Changeset 3232 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveGenerator.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/TranslocationMoveGenerator.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ThreeOptMoveGenerator.cs) (5 diffs)

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);
   }
 }