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

Timestamp:

12/03/14 17:14:56 (9 years ago)

Author:

bgoldman

Message:

#2282 Implemented DeceptiveTrapProblem and IsBetter

File:

• branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs (modified) (4 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
@@ -38 +39 @@
     [Storable]
     private IRandom random;
+    
+    private const string IterationsParameterName = "Iterations";
+
+    public IFixedValueParameter<IntValue> IterationsParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters[IterationsParameterName]; }
+    }
+
+    public int Iterations {
+      get { return IterationsParameter.Value.Value; }
+      set { IterationsParameter.Value.Value = value; }
+    }
 
     [StorableConstructor]
@@ -51 +63 @@
       : base() {
       random = new MersenneTwister();
+      Parameters.Add(new FixedValueParameter<IntValue>(IterationsParameterName, "", new IntValue(100)));
     }
     protected override void Run() {
-      bool[] solution = new bool[Problem.Length];
-      for (int i = 0; i < solution.Length; i++) {
-        solution[i] = random.Next(2) == 1;
+      var BestQuality = new DoubleValue(double.NaN);
+      Results.Add(new Result("Best quality", BestQuality));
+      for (int iteration = 0; iteration < Iterations; iteration++) {
+        bool[] solution = new bool[Problem.Length];
+        for (int i = 0; i < solution.Length; i++) {
+          solution[i] = random.Next(2) == 1;
+        }
+
+        var fitness = Problem.Evaluate(solution);
+
+        fitness = ImproveToLocalOptimum(Problem, solution, fitness, random);
+        if (double.IsNaN(BestQuality.Value) || Problem.IsBetter(fitness, BestQuality.Value)) {
+          BestQuality.Value = fitness;
+        }
       }
-      var fitness = Problem.Evaluate(solution);
-      fitness = ImproveToLocalOptimum(Problem, solution, fitness, random);
-
-      Results.Add(new Result("Best quality", new DoubleValue(fitness)));
-      Results.Add(new Result("Best solution", new BinaryVector(solution)));
     }
     public static double ImproveToLocalOptimum(BinaryVectorProblem problem, bool[] solution, double fitness, IRandom rand) {
@@ -70 +89 @@
           solution[option] = !solution[option];
           double newFitness = problem.Evaluate(solution);
-          if ((problem.Maximization && fitness < newFitness) || (!problem.Maximization && fitness > newFitness)) {
+          if (problem.IsBetter(newFitness, fitness)) {
             fitness = newFitness;
             tried.Clear();