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

Timestamp:

12/18/19 16:11:21 (5 years ago)

Author:

mkommend

Message:

#2521: Refactored single-objective problems to use EvaluationResult instead of double as return type from Evaluate.

File:

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

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

@@ -25 +25 @@
 using System.Linq;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +32 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Random;
 
@@ -110 +110 @@
         }
 
-        var fitness = Problem.Evaluate(solution, random);
+        var evaluationResult = Problem.Evaluate(solution, random);
+        var fitness = evaluationResult.Quality;
 
         fitness = ImproveToLocalOptimum(Problem, solution, fitness, random);
@@ -128 +129 @@
           if (tried.Contains(option)) continue;
           solution[option] = !solution[option];
-          double newFitness = problem.Evaluate(solution, rand);
+          var newEvaluationResult = problem.Evaluate(solution, rand);
+          double newFitness = newEvaluationResult.Quality;
           if (problem.IsBetter(newFitness, fitness)) {
             fitness = newFitness;