Changeset 17612 for branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs

Timestamp:

06/19/20 16:38:33 (4 years ago)

Author:

mkommend

Message:

#2521: Added first version of problem results.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs

@@ -45 +45 @@
   public class HillClimber : BasicAlgorithm {
     [Storable]
-    private IRandom random;
+    private readonly IRandom random;
 
     [Storable] public IFixedValueParameter<IntValue> MaximumIterationsParameter { get; private set; }
@@ -65 +65 @@
       get { return MaximumIterationsParameter.Value.Value; }
       set { MaximumIterationsParameter.Value.Value = value; }
+    }
+
+    private int Iterations {
+      get => IterationsResult.Value.Value;
+      set => IterationsResult.Value.Value = value;
+    }
+
+    private double BestQuality {
+      get => BestQualityResult.Value.Value;
+      set => BestQualityResult.Value.Value = value;
     }
 
@@ -88 +98 @@
     }
 
+    protected override void Initialize(CancellationToken cancellationToken) {
+      base.Initialize(cancellationToken);
+
+      IterationsResult.Value = new IntValue();
+      BestQualityResult.Value = new DoubleValue(double.NaN);
+    }
+
 
 
     protected override void Run(CancellationToken cancellationToken) {
-      IterationsResult.Value = new IntValue();
-      BestQualityResult.Value = new DoubleValue(double.NaN);
-
       while (IterationsResult.Value.Value < MaximumIterations) {
         cancellationToken.ThrowIfCancellationRequested();
@@ -106 +120 @@
 
         fitness = ImproveToLocalOptimum(Problem, solution, fitness, random);
-        var bestSoFar = BestQualityResult.Value.Value;
+        var bestSoFar = BestQuality;
         if (double.IsNaN(bestSoFar) || Problem.IsBetter(fitness, bestSoFar)) {
-          BestQualityResult.Value.Value = fitness;
+          BestQuality = fitness;
         }
 
-        IterationsResult.Value.Value++;
+        Iterations++;
       }
     }