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

Timestamp:

01/11/17 02:18:19 (7 years ago)

Author:

abeham

Message:

#2701: minor tweaks

File:

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

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

@@ -254 +254 @@
       offspring = Breed(token);
       if (offspring != null) {
-        if (Context.PopulationCount < MaximumPopulationSize)
-          AdaptiveClimb(offspring, Context.LocalSearchEvaluations, token);
         var replNew = Replace(offspring, token);
         if (replNew) {
@@ -265 +263 @@
       offspring = Relink(token);
       if (offspring != null) {
-        if (Context.PopulationCount < MaximumPopulationSize)
-          AdaptiveClimb(offspring, Context.LocalSearchEvaluations, token);
         if (Replace(offspring, token)) {
           replaced = true;
@@ -275 +271 @@
       offspring = Delink(token);
       if (offspring != null) {
-        if (Context.PopulationCount < MaximumPopulationSize)
-          AdaptiveClimb(offspring, Context.LocalSearchEvaluations, token);
         if (Replace(offspring, token)) {
           replaced = true;
@@ -285 +279 @@
       offspring = Sample(token);
       if (offspring != null) {
-        if (Context.PopulationCount < MaximumPopulationSize)
-          AdaptiveClimb(offspring, Context.LocalSearchEvaluations, token);
         if (Replace(offspring, token)) {
           replaced = true;
@@ -295 +287 @@
       if (!replaced && offspring != null) {
         if (Context.HillclimbingSuited(offspring)) {
-          AdaptiveClimb(offspring, Context.LocalSearchEvaluations, token);
+          HillClimb(offspring, token, CalculateSubspace(Context.Population.Select(x => x.Solution)));
           if (Replace(offspring, token)) {
             Context.ByHillclimbing++;