Changeset 11637

Timestamp:

12/03/14 16:16:05 (9 years ago)

Author:

mkommend

Message:

#2282: Implemented fitness for OneMaxProblem without lambdas.

Location:

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3

Files:

• HillClimber.cs (modified) (3 diffs)
• Problems/OneMaxProblem.cs (modified) (2 diffs)

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -68 +65 @@
     public static double ImproveToLocalOptimum(BinaryVectorProblem problem, bool[] solution, double fitness, IRandom rand) {
       var tried = new HashSet<int>();
-      
-      double newFitness=fitness;
       do {
         var options = Enumerable.Range(0, solution.Length).Shuffle(rand);
         foreach (var option in options) {
           solution[option] = !solution[option];
-          newFitness = problem.Evaluate(solution);
+          double newFitness = problem.Evaluate(solution);
           if ((problem.Maximization && fitness < newFitness) || (!problem.Maximization && fitness > newFitness)) {
             fitness = newFitness;
@@ -85 +80 @@
       } while (tried.Count != solution.Length);
       return fitness;
-    }     
+    }
   }
 }

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/Problems/OneMaxProblem.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -43 +42 @@
     public override double Evaluate(bool[] individual) {
       if (individual.Length != Length) throw new ArgumentException("The individual has not the correct length.");
-      return individual.Count(x => x);
+      //return individual.Count(x => x);
+      double quality = 0;
+      for (int i = 0; i < individual.Length; i++)
+        if (individual[i]) quality++;
+      return quality;
     }
   }