Changeset 5785 for branches/QAP/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.cs

Timestamp:

03/22/11 01:56:25 (13 years ago)

Author:

abeham

Message:

#1330

• Added Swap2 move to permutation (+tabu search operators)
• Added move evaluators for QAP (translocation/insertion missing)
• Merged trunk-changes from Optimization into QAP branch

Location:

branches/QAP/HeuristicLab.Encodings.PermutationEncoding

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Encodings.PermutationEncoding)
• 3.3/Manipulators/Swap2Manipulator.cs (modified) (1 diff)

branches/QAP/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.cs

@@ -49 +49 @@
     /// <param name="permutation">The permutation to manipulate.</param>
     public static void Apply(IRandom random, Permutation permutation) {
-      int index1, index2, temp;
+      int index1, index2;
 
       index1 = random.Next(permutation.Length);
       index2 = random.Next(permutation.Length);
 
-      temp = permutation[index1];
+      Apply(permutation, index1, index2);
+    }
+
+    public static void Apply(Permutation permutation, int index1, int index2) {
+      int temp = permutation[index1];
       permutation[index1] = permutation[index2];
       permutation[index2] = temp;