Changeset 14557

Timestamp:

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

Author:

abeham

Message:

#2701: minor tweaks

Location:

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3

Files:

• Binary/BinaryMemPR.cs (modified) (1 diff)
• MemPRAlgorithm.cs (modified) (5 diffs)

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

@@ -160 +160 @@
       while (evaluations < N) {
         BinaryVector c = null;
-        var xochoice = Context.Random.NextDouble();
-        if (xochoice < 0.2)
-          c = NPointCrossover.Apply(Context.Random, p1.Solution, p2.Solution, new IntValue(1));
-        else if (xochoice < 0.5)
-          c = NPointCrossover.Apply(Context.Random, p1.Solution, p2.Solution, new IntValue(2));
-        else c = UniformCrossover.Apply(Context.Random, p1.Solution, p2.Solution);
+        var xochoice = Context.Random.Next(3);
+        switch (xochoice) {
+          case 0: c = NPointCrossover.Apply(Context.Random, p1.Solution, p2.Solution, new IntValue(1)); break;
+          case 1: c = NPointCrossover.Apply(Context.Random, p1.Solution, p2.Solution, new IntValue(2)); break;
+          case 2: c = UniformCrossover.Apply(Context.Random, p1.Solution, p2.Solution); break;
+        }
         if (cache.Contains(c)) {
           cacheHits++;
-          if (cacheHits > 20) break;
+          if (cacheHits > 50) break;
           continue;
         }

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++;