Changeset 14552 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary/LocalSearch/StaticAPI

Timestamp:

01/09/17 00:36:20 (8 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/Binary/LocalSearch/StaticAPI/ExhaustiveBitflip.cs (modified) (2 diffs)

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary/LocalSearch/StaticAPI/ExhaustiveBitflip.cs

@@ -30 +30 @@
 namespace HeuristicLab.Encodings.Binary.LocalSearch {
   public static class ExhaustiveBitflip {
-    public static Tuple<int, int> Optimize(IRandom random, BinaryVector solution, ref double quality, bool maximization, Func<BinaryVector, double> evalFunc, CancellationToken token, bool[] subspace = null) {
-      if (double.IsNaN(quality)) quality = evalFunc(solution);
+    public static Tuple<int, int> Optimize(IRandom random, BinaryVector solution, ref double quality, bool maximization, Func<BinaryVector, CancellationToken, double> evalFunc, CancellationToken token, bool[] subspace = null) {
+      if (double.IsNaN(quality)) quality = evalFunc(solution, token);
       var improved = false;
       var order = Enumerable.Range(0, solution.Length).Shuffle(random).ToArray();
@@ -47 +47 @@
           // bitflip the solution
           solution[idx] = !solution[idx];
-          var after = evalFunc(solution);
+          var after = evalFunc(solution, token);
           evaluations++;
           if (FitnessComparer.IsBetter(maximization, after, quality)) {