Changeset 3221 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/ExhaustiveTwoOptMoveGenerator.cs

Timestamp:

03/26/10 00:04:24 (14 years ago)

Author:

abeham

Message:

updated permutation moves, fixed 3-opt #889

File:

• trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/ExhaustiveTwoOptMoveGenerator.cs (modified) (2 diffs)

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

@@ -26 +26 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("ExhaustiveTwoOptMoveGenerator", "Generates all possible 2-opt moves from a given permutation.")]
+  [Item("ExhaustiveTwoOptMoveGenerator", "Generates all possible 2-opt moves (inversion) from a given permutation.")]
   [StorableClass]
   public class ExhaustiveTwoOptMoveGenerator : TwoOptMoveGenerator, IExhaustiveMoveGenerator {
     public static TwoOptMove[] Apply(Permutation permutation) {
       int length = permutation.Length;
-      int totalMoves = (length) * (length - 1) / 2 - 3;
+      int totalMoves = (length) * (length - 1) / 2; // - 3;
       TwoOptMove[] moves = new TwoOptMove[totalMoves];
       int count = 0;
@@ -37 +37 @@
         for (int j = i + 1; j < length; j++) {
           // doesn't make sense to inverse the whole permutation or the whole but one
-          if (i == 0 && j >= length - 2) continue;
-          else if (i == 1 && j >= length - 1) continue;
+          /*if (i == 0 && j >= length - 2) continue;
+          else if (i == 1 && j >= length - 1) continue;*/
           moves[count++] = new TwoOptMove(i, j);
         }