Changeset 17382 for branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.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/EvaluationTracker.cs (modified) (3 diffs)

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

@@ -95 +95 @@
     }
 
-    public double Evaluate(BinaryVector vector, IRandom random) {
+    public ISingleObjectiveEvaluationResult Evaluate(BinaryVector vector, IRandom random) {
       return Evaluate(vector, random, CancellationToken.None);
     }
 
-    public double Evaluate(BinaryVector vector, IRandom random, CancellationToken cancellationToken) {
+    public ISingleObjectiveEvaluationResult Evaluate(BinaryVector vector, IRandom random, CancellationToken cancellationToken) {
       if (Evaluations >= maxEvaluations) throw new OperationCanceledException("Maximum Evaluation Limit Reached");
       Evaluations++;
-      double fitness = problem.Evaluate(vector, random);
+
+      var evaluationResult = problem.Evaluate(vector, random);
+      double fitness = evaluationResult.Quality;
       if (double.IsNaN(BestQuality) || problem.IsBetter(fitness, BestQuality)) {
         BestQuality = fitness;
@@ -108 +110 @@
         BestFoundOnEvaluation = Evaluations;
       }
-      return fitness;
+      return evaluationResult;
     }
 
@@ -115 +117 @@
     }
     public void Evaluate(ISingleObjectiveSolutionContext<BinaryVector> solutionContext, IRandom random, CancellationToken cancellationToken) {
-      double quality = Evaluate(solutionContext.EncodedSolution, random, cancellationToken);
-      solutionContext.EvaluationResult = new SingleObjectiveEvaluationResult(quality);
+      var evaluationResult = Evaluate(solutionContext.EncodedSolution, random, cancellationToken);
+      solutionContext.EvaluationResult = evaluationResult;
     }