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

Timestamp:

11/22/19 15:54:31 (5 years ago)

Author:

mkommend

Message:

#2521: Fixed bugs in solution context and adapted programmable problem template to include a cancellation token in the evaluate function.

Location:

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

Files:

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

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

@@ -63 +63 @@
     }
     void ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution>.Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random, CancellationToken cancellationToken) {
-      double quality = CompiledProblemDefinition.Evaluate(solutionContext.EncodedSolution, random, cancellationToken);
-      solutionContext.EvaluationResult = new SingleObjectiveEvaluationResult(quality);
+      CompiledProblemDefinition.Evaluate(solutionContext, random, cancellationToken);
     }
 

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

@@ -2 +2 @@
 using System.Linq;
 using System.Collections.Generic;
+using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
     }
 
-    public override double Evaluate(CombinedSolution solution, IRandom random) {
+    public override double Evaluate(CombinedSolution solution, IRandom random, CancellationToken cancellationToken) {
       // Use vars.yourVariable to access variables in the variable store i.e. yourVariable
       var quality = 0.0;

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

@@ -2 +2 @@
 using System.Linq;
 using System.Collections.Generic;
+using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -20 +21 @@
     }
 
-    public override double Evaluate(SOLUTION_CLASS solution, IRandom random) {
+    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;