Changeset 3232 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticInversionSingleMoveGenerator.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/StochasticInversionSingleMoveGenerator.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticTwoOptSingleMoveGenerator.cs) (1 diff)

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("StochasticTwoOptSingleMoveGenerator", "Randomly samples a single from all possible 2-opt moves (inversion) from a given permutation.")]
+  [Item("StochasticInversionSingleMoveGenerator", "Randomly samples a single from all possible inversion moves (2-opt) from a given permutation.")]
   [StorableClass]
-  public class StochasticTwoOptSingleMoveGenerator : TwoOptMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
+  public class StochasticInversionSingleMoveGenerator : InversionMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
 
-    public StochasticTwoOptSingleMoveGenerator()
+    public StochasticInversionSingleMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
     }
 
-    public static TwoOptMove Apply(Permutation permutation, IRandom random) {
+    public static InversionMove Apply(Permutation permutation, IRandom random) {
       int length = permutation.Length;
       int index1 = random.Next(length - 1);
       int index2 = random.Next(index1 + 1, length);
-      return new TwoOptMove(index1, index2);;
+      return new InversionMove(index1, index2);;
     }
 
-    protected override TwoOptMove[] GenerateMoves(Permutation permutation) {
+    protected override InversionMove[] GenerateMoves(Permutation permutation) {
       IRandom random = RandomParameter.ActualValue;
-      return new TwoOptMove[] { Apply(permutation, random) };
+      return new InversionMove[] { Apply(permutation, random) };
     }
   }