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

Timestamp:

01/15/17 09:57:50 (7 years ago)

Author:

abeham

Message:

#2701:

• changed adaptive walk performance model to relative
• added ConfidenceConstantModel for regression
• using constant model as fallback to GPR
• reorganized code

File:

• branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/MemPRAlgorithm.cs (modified) (2 diffs)

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

@@ -302 +302 @@
 
       if (!replaced && offspring != null) {
-        if (Context.HillclimbingSuited(offspring)) {
+        if (Context.HillclimbingSuited(offspring.Fitness)) {
           HillClimb(offspring, token, CalculateSubspace(Context.Population.Select(x => x.Solution)));
           if (Replace(offspring, token)) {
@@ -566 +566 @@
       AdaptiveWalk(newScope, maxEvals, token, subspace);
       
+      Context.AddAdaptivewalkingResult(scope, newScope);
       if (Context.IsBetter(newScope, scope)) {
-        Context.AddAdaptivewalkingResult(scope, newScope);
         scope.Adopt(newScope);
-      } else if (!Eq(newScope, scope))
-        Context.AddAdaptivewalkingResult(scope, newScope);
+      }
     }
     protected abstract void AdaptiveWalk(ISingleObjectiveSolutionScope<TSolution> scope, int maxEvals, CancellationToken token, ISolutionSubspace<TSolution> subspace = null);