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

Timestamp:

06/10/20 12:15:23 (4 years ago)

Author:

mkommend

Message:

#2521: Added first version of new results. The first algorithm that has been adapted for testing purposes is the hill climber.

File:

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

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

@@ -31 +31 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Optimization;
+
 using HeuristicLab.Parameters;
 using HeuristicLab.Random;
@@ -47 +48 @@
 
     [Storable] public IFixedValueParameter<IntValue> MaximumIterationsParameter { get; private set; }
-    [Storable] public IResultParameter<DoubleValue> BestQualityResultParameter { get; private set; }
-    [Storable] public IResultParameter<IntValue> IterationsResultParameter { get; private set; }
+
+    [Storable] public IResult<DoubleValue> BestQualityResult { get; private set; }
+    [Storable] public IResult<IntValue> IterationsResult { get; private set; }
 
     public override Type ProblemType {
@@ -70 +72 @@
       : base(original, cloner) {
       MaximumIterationsParameter = cloner.Clone(original.MaximumIterationsParameter);
-      BestQualityResultParameter = cloner.Clone(original.BestQualityResultParameter);
-      IterationsResultParameter = cloner.Clone(original.IterationsResultParameter);
+      BestQualityResult = cloner.Clone(original.BestQualityResult);
+      IterationsResult = cloner.Clone(original.IterationsResult);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -81 +83 @@
       random = new MersenneTwister();
       Parameters.Add(MaximumIterationsParameter = new FixedValueParameter<IntValue>("Maximum Iterations", "", new IntValue(100)));
-      Parameters.Add(BestQualityResultParameter = new ResultParameter<DoubleValue>("Best Quality", "", "Results", new DoubleValue(double.NaN)));
-      Parameters.Add(IterationsResultParameter = new ResultParameter<IntValue>("Iterations", "", "Results", new IntValue(0)));
+
+      Results.Add(BestQualityResult = new Result<DoubleValue>("Best Quality"));
+      Results.Add(IterationsResult = new Result<IntValue>("Iterations"));
     }
 
+
+
     protected override void Run(CancellationToken cancellationToken) {
-      while (IterationsResultParameter.ActualValue.Value < MaximumIterations) {
+      IterationsResult.Value = new IntValue();
+      BestQualityResult.Value = new DoubleValue(double.NaN);
+
+      while (IterationsResult.Value.Value < MaximumIterations) {
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -98 +106 @@
 
         fitness = ImproveToLocalOptimum(Problem, solution, fitness, random);
-        var bestSoFar = BestQualityResultParameter.ActualValue.Value;
+        var bestSoFar = BestQualityResult.Value.Value;
         if (double.IsNaN(bestSoFar) || Problem.IsBetter(fitness, bestSoFar)) {
-          BestQualityResultParameter.ActualValue.Value = fitness;
+          BestQualityResult.Value.Value = fitness;
         }
 
-        IterationsResultParameter.ActualValue.Value++;
+        IterationsResult.Value.Value++;
       }
     }