Changeset 14456 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary

Timestamp:

12/06/16 15:07:45 (8 years ago)

Author:

abeham

Message:

#2701:

• Using evaluated solutions from HC as max evaluations for tabu walking in MemPR
• Fixed some bugs in MemPR (permutation) regarding subspace calculation (true means okay, false means no)
• Fixed bug in TSP

File:

• branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary/BinaryMemPR.cs (modified) (6 diffs)

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary/BinaryMemPR.cs

@@ -97 +97 @@
     }
 
-    protected override void TabuWalk(ISingleObjectiveSolutionScope<BinaryVector> scope, int steps, CancellationToken token, ISolutionSubspace<BinaryVector> subspace = null) {
+    protected override int TabuWalk(ISingleObjectiveSolutionScope<BinaryVector> scope, int maxEvals, CancellationToken token, ISolutionSubspace<BinaryVector> subspace = null) {
       var evaluations = 0;
       var subset = subspace != null ? ((BinarySolutionSubspace)subspace).Subspace : null;
@@ -111 +111 @@
       for (var i = 0; i < N; i++) tabu[i] = Tuple.Create(current[i] ? double.NaN : currentScope.Fitness, !current[i] ? double.NaN : currentScope.Fitness);
       var subN = subset != null ? subset.Count(x => x) : N;
-      if (subN == 0) return;
+      if (subN == 0) return 0;
       var order = Enumerable.Range(0, N).Where(x => subset == null || subset[x]).Shuffle(Context.Random).ToArray();
 
-      for (var iter = 0; iter < steps; iter++) {
+      var steps = 0;
+      var stepsUntilBestOfWalk = 0;
+      for (var iter = 0; iter < int.MaxValue; iter++) {
         var allTabu = true;
         var bestOfTheRestF = double.NaN;
@@ -130 +132 @@
           if (IsBetter(after, before) && (bestOfTheWalk == null || IsBetter(after, bestOfTheWalk.Fitness))) {
             bestOfTheWalk = (SingleObjectiveSolutionScope<BinaryVector>)currentScope.Clone();
+            stepsUntilBestOfWalk = steps;
           }
 
@@ -138 +141 @@
           if (IsBetter(after, before) && !isTabu) {
             improved = true;
+            steps++;
             tabu[idx] = current[idx] ? Tuple.Create(after, tabu[idx].Item2) : Tuple.Create(tabu[idx].Item1, after);
           } else { // undo the move
@@ -147 +151 @@
             currentScope.Fitness = before;
           }
+          if (evaluations >= maxEvals) break;
         }
         if (!allTabu && !improved) {
@@ -153 +158 @@
           tabu[bestOfTheRest] = current[bestOfTheRest] ? Tuple.Create(better, tabu[bestOfTheRest].Item2) : Tuple.Create(tabu[bestOfTheRest].Item1, better);
           currentScope.Fitness = bestOfTheRestF;
+          steps++;
         } else if (allTabu) break;
+        if (evaluations >= maxEvals) break;
       }
 
       Context.IncrementEvaluatedSolutions(evaluations);
       scope.Adopt(bestOfTheWalk ?? currentScope);
+      return stepsUntilBestOfWalk;
     }