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

Timestamp:

04/14/10 03:52:07 (14 years ago)

Author:

abeham

Message:

Updated Tabu search, permutation move operators, real vector move operators, binary vector move operators #840
Added a Tabu Search TSP workbench

File:

• trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationSingleMoveGenerator.cs (modified) (1 diff)

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

@@ -43 +43 @@
       int length = permutation.Length;
       int index1, index2, index3;
-      index1 = random.Next(length - 1);
       do {
-        index2 = random.Next(index1, length);
-      } while (index2 - index1 >= length - 2);
-      do {
-        index3 = random.Next(length - index2 + index1);
-      } while (index3 == index1);
-      
+        index1 = random.Next(length);
+        do {
+          index2 = random.Next(index1, length);
+        } while (index2 - index1 >= length - 2);
+        do {
+          index3 = random.Next(length - index2 + index1);
+        } while (index3 == index1);
+      } while (permutation.PermutationType != PermutationTypes.Absolute && (index1 == 0 && index3 == length - 1 || index1 == length - 1 && index3 == 0));
       return new TranslocationMove(index1, index2, index3);
     }