Changeset 14552 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Permutation/LocalSearch/StaticAPI/Exhaustive1Shift.cs

Timestamp:

01/09/17 00:36:20 (7 years ago)

Author:

abeham

Message:

#2701:

• Added alternating bits binary test Problem
• Refactored MemPR to work with programmable problem in current trunk
• fixed a bug in permutation MemPR when crossover doesn't assign an offspring

File:

• branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Permutation/LocalSearch/StaticAPI/Exhaustive1Shift.cs (modified) (2 diffs)

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Permutation/LocalSearch/StaticAPI/Exhaustive1Shift.cs

@@ -31 +31 @@
   public static class Exhaustive1Shift {
     public static Tuple<int, int> HillClimb(IRandom random, Encodings.PermutationEncoding.Permutation perm,
-      ref double quality, bool maximization, Func<Encodings.PermutationEncoding.Permutation, double> eval,
+      ref double quality, bool maximization, Func<Encodings.PermutationEncoding.Permutation, CancellationToken, double> eval,
       CancellationToken token, bool[,] subspace = null) {
       var evaluations = 0;
       var current = perm;
       if (double.IsNaN(quality)) {
-        quality = eval(current);
+        quality = eval(current, token);
         evaluations++;
       }
@@ -59 +59 @@
             continue;
           TranslocationManipulator.Apply(current, shift.Index1, shift.Index2, shift.Index3);
-          var q = eval(current);
+          var q = eval(current, token);
           evaluations++;
           if (FitnessComparer.IsBetter(maximization, q, quality)) {