Changeset 3340 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveTabuMaker.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/TranslocationMoveTabuMaker.cs (modified) (1 diff)

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

@@ -48 +48 @@
     }
 
-    protected override IItem GetTabuAttribute() {
+    protected override IItem GetTabuAttribute(bool maximization, double quality, double moveQuality) {
       TranslocationMove move = TranslocationMoveParameter.ActualValue;
       Permutation permutation = PermutationParameter.ActualValue;
-      if (move.Index3 > move.Index1)
-        return new TranslocationMoveAttribute(permutation.GetCircular(move.Index1 - 1),
-        permutation[move.Index1],
-        permutation[move.Index2],
-        permutation.GetCircular(move.Index2 + 1),
-        permutation.GetCircular(move.Index3 + move.Index2 - move.Index1),
-        permutation.GetCircular(move.Index3 + move.Index2 - move.Index1 + 1));
-      else
-        return new TranslocationMoveAttribute(permutation.GetCircular(move.Index1 - 1),
-        permutation[move.Index1],
-        permutation[move.Index2],
-        permutation.GetCircular(move.Index2 + 1),
-        permutation.GetCircular(move.Index3 - 1),
-        permutation.GetCircular(move.Index3));
+      double baseQuality = moveQuality;
+      if (maximization && quality > moveQuality || !maximization && quality < moveQuality) baseQuality = quality; // we make an uphill move, the lower bound is the solution quality
+      if (permutation.PermutationType == PermutationTypes.Absolute) {
+        int[] numbers = new int[move.Index2 - move.Index1 + 1];
+        for (int i = 0; i < numbers.Length; i++) {
+          numbers[i] = permutation[i + move.Index1];
+        }
+        return new TranslocationMoveAbsoluteAttribute(numbers, move.Index1, move.Index3, baseQuality); ;
+      } else {
+        if (move.Index3 > move.Index1)
+          return new TranslocationMoveRelativeAttribute(permutation.GetCircular(move.Index1 - 1),
+          permutation[move.Index1],
+          permutation[move.Index2],
+          permutation.GetCircular(move.Index2 + 1),
+          permutation.GetCircular(move.Index3 + move.Index2 - move.Index1),
+          permutation.GetCircular(move.Index3 + move.Index2 - move.Index1 + 1),
+          baseQuality);
+        else
+          return new TranslocationMoveRelativeAttribute(permutation.GetCircular(move.Index1 - 1),
+          permutation[move.Index1],
+          permutation[move.Index2],
+          permutation.GetCircular(move.Index2 + 1),
+          permutation.GetCircular(move.Index3 - 1),
+          permutation.GetCircular(move.Index3),
+          baseQuality);
+      }
     }
   }