Changeset 17363 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs

Timestamp:

11/21/19 17:58:32 (4 years ago)

Author:

mkommend

Message:

#2521: First version of contexts in problem evaluation.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs

@@ -46 +46 @@
     }
 
-    public Func<TEncodedSolution, IRandom, double> EvaluateFunc { get; set; }
+    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom> Evaluate { get; set; }
 
     [StorableConstructor]
@@ -63 +63 @@
       var encoding = EncodingParameter.ActualValue;
       var solution = ScopeUtil.GetEncodedSolution(ExecutionContext.Scope, encoding);
-      QualityParameter.ActualValue = new DoubleValue(EvaluateFunc(solution, random));
+      var solutionContext = new SingleObjectiveSolutionContextScope<TEncodedSolution>(ExecutionContext.Scope, solution);
+
+      Evaluate(solutionContext, random);
+      var qualityValue = solutionContext.EvaluationResult.Quality;
+
+      QualityParameter.ActualValue = new DoubleValue(qualityValue);
       return base.InstrumentedApply();
     }