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

Timestamp:

12/06/16 15:07:45 (7 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/MemPRAlgorithm.cs (modified) (7 diffs)

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

@@ -231 +231 @@
           Analyze(token);
           token.ThrowIfCancellationRequested();
+          if (Terminate()) return;
         }
         Context.HcSteps /= 2;
@@ -314 +315 @@
         Results.Add(new Result("Iterations", new IntValue(Context.Iterations)));
       else ((IntValue)res.Value).Value = Context.Iterations;
+      if (!Results.TryGetValue("HcSteps", out res))
+        Results.Add(new Result("HcSteps", new IntValue(Context.HcSteps)));
+      else ((IntValue)res.Value).Value = Context.HcSteps;
       if (!Results.TryGetValue("ByBreeding", out res))
         Results.Add(new Result("ByBreeding", new IntValue(Context.ByBreeding)));
@@ -491 +495 @@
       Context.HillclimbingStat.Add(Tuple.Create(before, after));
       Context.IncrementEvaluatedSolutions(lscontext.EvaluatedSolutions);
-      return lscontext.Iterations;
+      return lscontext.EvaluatedSolutions;
     }
 
@@ -501 +505 @@
       var before = scope.Fitness;
       var newScope = (ISingleObjectiveSolutionScope<TSolution>)scope.Clone();
-      TabuWalk(newScope, steps, token, subspace);
+      var newSteps = TabuWalk(newScope, steps, token, subspace);
       Context.TabuwalkingStat.Add(Tuple.Create(before, newScope.Fitness));
+      //Context.HcSteps = (int)Math.Ceiling(Context.HcSteps * (1.0 + Context.TabuwalkingStat.Count) / (2.0 + Context.TabuwalkingStat.Count) + newSteps / (2.0 + Context.TabuwalkingStat.Count));
       if (IsBetter(newScope, scope) || (newScope.Fitness == scope.Fitness && Dist(newScope, scope) > 0))
         scope.Adopt(newScope);
     }
-    protected abstract void TabuWalk(ISingleObjectiveSolutionScope<TSolution> scope, int steps, CancellationToken token, ISolutionSubspace<TSolution> subspace = null);
+    protected abstract int TabuWalk(ISingleObjectiveSolutionScope<TSolution> scope, int maxEvals, CancellationToken token, ISolutionSubspace<TSolution> subspace = null);
     protected virtual void TabuClimb(ISingleObjectiveSolutionScope<TSolution> scope, int steps, CancellationToken token, ISolutionSubspace<TSolution> subspace = null) {
       if (double.IsNaN(scope.Fitness)) {
@@ -514 +519 @@
       var before = scope.Fitness;
       var newScope = (ISingleObjectiveSolutionScope<TSolution>)scope.Clone();
-      TabuWalk(newScope, steps, token, subspace);
+      var newSteps = TabuWalk(newScope, steps, token, subspace);
       Context.TabuwalkingStat.Add(Tuple.Create(before, newScope.Fitness));
+      //Context.HcSteps = (int)Math.Ceiling(Context.HcSteps * (1.0 + Context.TabuwalkingStat.Count) / (2.0 + Context.TabuwalkingStat.Count) + newSteps / (2.0 + Context.TabuwalkingStat.Count));
       if (IsBetter(newScope, scope) || (newScope.Fitness == scope.Fitness && Dist(newScope, scope) > 0))
         scope.Adopt(newScope);
@@ -557 +563 @@
         || Context.Population.Any(p => IsBetter(offspring, p))) return offspring;
 
-      if (IsBetter(offspring.Fitness, Context.BestQuality))
-        HillClimb(offspring, token); // perform hillclimb in full solution space
-      else if (HillclimbingSuited(offspring))
+      if (HillclimbingSuited(offspring))
         HillClimb(offspring, token, subspace); // perform hillclimb in the solution sub-space
       return offspring;
@@ -589 +593 @@
       if (dist1 > 0 && dist2 > 0) {
         var subspace = CalculateSubspace(new[] { a.Solution, b.Solution }, inverse: true);
-        if (IsBetter(child.Fitness, Context.BestQuality))
-          HillClimb(child, token); // perform hillclimb in full solution space
-        else if (HillclimbingSuited(child)) {
+        if (HillclimbingSuited(child)) {
           HillClimb(child, token, subspace); // perform hillclimb in solution sub-space
         }