Changeset 17320 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming

Timestamp:

10/04/19 17:31:54 (5 years ago)

Author:

mkommend

Message:

#2521: Added cancellation token to evaluate function of problems.

Location:

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

Files:

• ArtificialAnt/Problem.cs (modified) (2 diffs)
• BasicSymbolicRegression/Problem.cs (modified) (2 diffs)
• Boolean/EvenParityProblem.cs (modified) (2 diffs)
• Boolean/MultiplexerProblem.cs (modified) (2 diffs)
• LawnMower/Problem.cs (modified) (2 diffs)
• robocode/Problem.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Problem.cs

@@ -23 +23 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -134 +135 @@
 
 
-    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random) {
+    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random, CancellationToken cancellationToken) {
       var interpreter = new Interpreter(tree, World, MaxTimeSteps);
       interpreter.Run();

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression/Problem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -89 +90 @@
 
 
-    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random) {
+    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random, CancellationToken cancellationToken) {
       // Doesn't use classes from HeuristicLab.Problems.DataAnalysis.Symbolic to make sure that the implementation can be fully understood easily.
       // HeuristicLab.Problems.DataAnalysis.Symbolic would already provide all the necessary functionality (esp. interpreter) but at a much higher complexity.

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/EvenParityProblem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -103 +104 @@
 
 
-    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random) {
+    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random, CancellationToken cancellationToken) {
       if (NumberOfBits <= 0) throw new NotSupportedException("Number of bits must be larger than zero.");
       if (NumberOfBits > 10) throw new NotSupportedException("Even parity does not support problems with number of bits > 10.");

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/MultiplexerProblem.cs

@@ -24 +24 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -117 +118 @@
 
 
-    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random) {
+    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random, CancellationToken cancellationToken) {
       if (NumberOfBits <= 0) throw new NotSupportedException("Number of bits must be larger than zero.");
       if (NumberOfBits > 37) throw new NotSupportedException("Multiplexer does not support problems with number of bits > 37.");

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Problem.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -92 +93 @@
     }
 
-    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random) {
+    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random, CancellationToken cancellationToken) {
       var length = LawnLengthParameter.Value.Value;
       var width = LawnWidthParameter.Value.Value;

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Problem.cs

@@ -20 +20 @@
 #endregion
 
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -98 +99 @@
     private void AfterDeserialization() { RegisterEventHandlers(); }
 
-    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random) {
+    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random, CancellationToken cancellationToken) {
       return Interpreter.EvaluateTankProgram(tree, RobocodePath, Enemies, null, false, NrOfRounds);
     }