Changeset 3706 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt

Timestamp:

05/07/10 16:29:25 (15 years ago)

Author:

abeham

Message:

#839

• Added some checks to allow moves in permutation of length 2 or 3.

Location:

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt

Files:

• ExhaustiveInsertionMoveGenerator.cs (modified) (2 diffs)
• StochasticTranslocationMultiMoveGenerator.cs (modified) (1 diff)
• StochasticTranslocationSingleMoveGenerator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ExhaustiveInsertionMoveGenerator.cs

@@ -35 +35 @@
     public static TranslocationMove[] Apply(Permutation permutation) {
       int length = permutation.Length;
+      if (length == 1) throw new ArgumentException("ExhaustiveInsertionMoveGenerator: There cannot be an insertion move given a permutation of length 1.", "permutation");
       TranslocationMove[] moves = null;
       int count = 0;
@@ -45 +46 @@
         }
       } else {
-        moves = new TranslocationMove[length * (length - 1) - 2];
-        for (int i = 0; i < length; i++) {
-          for (int j = 1; j <= length - 1; j++) {
-            if (i == 0 && j == length - 1
-              || i == length - 1 && j == 1) continue;
-            moves[count++] = new TranslocationMove(i, i, (i + j) % length);
+        if (length > 2) {
+          moves = new TranslocationMove[length * (length - 1) - 2];
+          for (int i = 0; i < length; i++) {
+            for (int j = 1; j <= length - 1; j++) {
+              if (i == 0 && j == length - 1
+                || i == length - 1 && j == 1) continue;
+              moves[count++] = new TranslocationMove(i, i, (i + j) % length);
+            }
           }
+        } else { // doesn't make sense, but just create a dummy move to not crash the algorithms
+          moves = new TranslocationMove[1];
+          moves[0] = new TranslocationMove(0, 0, 1);
         }
       }

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationMultiMoveGenerator.cs

@@ -54 +54 @@
       TranslocationMove[] moves = new TranslocationMove[sampleSize];
       for (int i = 0; i < sampleSize; i++) {
-        moves[i] = StochasticThreeOptSingleMoveGenerator.Apply(permutation, random);
+        moves[i] = StochasticTranslocationSingleMoveGenerator.Apply(permutation, random);
       }
       return moves;

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationSingleMoveGenerator.cs

@@ -31 +31 @@
   [Item("StochasticTranslocationSingleMoveGenerator", "Randomly samples one from all possible translocation and insertion moves (3-opt) from a given permutation.")]
   [StorableClass]
-  public class StochasticThreeOptSingleMoveGenerator : TranslocationMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
+  public class StochasticTranslocationSingleMoveGenerator : TranslocationMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
 
-    public StochasticThreeOptSingleMoveGenerator()
+    public StochasticTranslocationSingleMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
@@ -43 +43 @@
     public static TranslocationMove Apply(Permutation permutation, IRandom random) {
       int length = permutation.Length;
+      if (length == 1) throw new ArgumentException("StochasticThreeOptSingleMoveGenerator: There cannot be an insertion move given a permutation of length 1.", "permutation");
+      if (permutation.PermutationType != PermutationTypes.Absolute && length == 2) return new TranslocationMove(0, 0, 1);
       int index1, index2, index3;
       do {