Changeset 17382 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable

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.

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3

Files:

• CompiledProblemDefinition.cs (modified) (2 diffs)
• SingleObjectiveProblemDefinitionScript.cs (modified) (1 diff)
• SingleObjectiveProgrammableProblem.cs (modified) (1 diff)
• Templates/SingleObjectiveProblem_Template.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/CompiledProblemDefinition.cs

@@ -61 +61 @@
     public abstract bool Maximization { get; }
 
-    public virtual double Evaluate(TEncodedSolution solution, IRandom random) {
+    public virtual ISingleObjectiveEvaluationResult Evaluate(TEncodedSolution solution, IRandom random) {
       return Evaluate(solution, random, CancellationToken.None);
     }
-    public abstract double Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
+    public abstract ISingleObjectiveEvaluationResult Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
 
     public virtual void Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random) {
@@ -70 +70 @@
     }
     public virtual void Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> 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;
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.cs

@@ -51 +51 @@
     public bool Maximization => CompiledProblemDefinition.Maximization;
 
-    double ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Evaluate(TEncodedSolution solution, IRandom random) {
+    ISingleObjectiveEvaluationResult ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Evaluate(TEncodedSolution solution, IRandom random) {
       return CompiledProblemDefinition.Evaluate(solution, random);
     }
 
-    double ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken) {
+    ISingleObjectiveEvaluationResult ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken) {
       return CompiledProblemDefinition.Evaluate(solution, random, cancellationToken);
     }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -111 +111 @@
       ProblemDefinition.Evaluate(solutionContext, random, cancellationToken);
     }
-    public override double Evaluate(TEncodedSolution individual, IRandom random, CancellationToken cancellationToken) {
+    public override ISingleObjectiveEvaluationResult Evaluate(TEncodedSolution individual, IRandom random, CancellationToken cancellationToken) {
       return ProblemDefinition.Evaluate(individual, random, cancellationToken);
     }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/Templates/SingleObjectiveProblem_Template.cs

@@ -23 +23 @@
     //TODO add other methods
 
-    public override void Evaluate(ISingleObjectiveSolutionContext<SOLUTION_CLASS> solutionContext, IRandom random, CancellationToken cancellationToken) {
-      var quality = Evaluate(solutionContext.EncodedSolution, random, cancellationToken);
+    public override ISingleObjectiveEvaluationResult Evaluate(SOLUTION_CLASS solution, IRandom random, CancellationToken cancellationToken) {
+      // Use vars.yourVariable to access variables in the variable store i.e. yourVariable
+      var quality = 0.0;
       var evaluationResult = new SingleObjectiveEvaluationResult(quality);
-      solutionContext.EvaluationResult = evaluationResult;
+      return evaluationResult;
     }
 
-    public override double Evaluate(SOLUTION_CLASS solution, IRandom random, CancellationToken cancellationToken) {
-      // Use vars.yourVariable to access variables in the variable store i.e. yourVariable
-      var quality = 0.0;
-      return quality;
-    }
-
-    public override void Analyze(ISingleObjectiveSolutionContext<TEncodedSolution>[] solutionContexts, ResultCollection results, IRandom random) {
+    public override void Analyze(ISingleObjectiveSolutionContext<SOLUTION_CLASS>[] solutionContexts, ResultCollection results, IRandom random) {
       var solutions = solutionContexts.Select(c => c.EncodedSolution).ToArray();
       var qualities = solutionContexts.Select(c => c.EvaluationResult.Quality).ToArray();