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

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