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

Timestamp:

12/03/16 00:32:09 (8 years ago)

Author:

abeham

Message:

#2701: working on MemPR implementation

Location:

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

Files:

• . (added)
• ExhaustiveBitflip.cs (moved) (moved from branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary/LocalSearch/Heuristic.cs) (4 diffs)

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

@@ -23 +23 @@
 using System.Linq;
 using System.Threading;
+using HeuristicLab.Algorithms.MemPR.Util;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
@@ -28 +29 @@
 
 namespace HeuristicLab.Encodings.Binary.LocalSearch {
-  public static class Heuristic {
-    private static bool IsBetter(bool maximization, double a, double b) {
-      return maximization && a > b
-        || !maximization && a < b;
-    }
-
-    public static Tuple<int, int> ExhaustiveBitFlipSearch(IRandom random, BinaryVector solution, ref double quality, bool maximization, Func<BinaryVector, double> evalFunc, CancellationToken token, bool[] subspace = null) {
+  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);
       var improved = false;
@@ -53 +49 @@
           var after = evalFunc(solution);
           evaluations++;
-          if (IsBetter(maximization, after, quality)) {
+          if (FitnessComparer.IsBetter(maximization, after, quality)) {
             steps++;
             quality = after;
@@ -65 +61 @@
         }
       } while (improved);
-      
+
       return Tuple.Create(evaluations, steps);
     }