Changeset 17320 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization

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.Optimization/3.3/BasicProblems

Files:

• Interfaces/IMultiObjectiveProblem.cs (modified) (1 diff)
• Interfaces/IMultiObjectiveProblemDefinition.cs (modified) (2 diffs)
• Interfaces/ISingleObjectiveProblem.cs (modified) (1 diff)
• Interfaces/ISingleObjectiveProblemDefinition.cs (modified) (2 diffs)
• MultiObjectiveProblem.cs (modified) (2 diffs)
• SingleObjectiveProblem.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiObjectiveProblem.cs

@@ -33 +33 @@
     where TEncoding : class, IEncoding<TEncodedSolution>
     where TEncodedSolution : class, IEncodedSolution { }
+
+  //TODO derive IMutliObjectiveProblem from IMultiObjectiveProblemDefinition?
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Core;
@@ -38 +39 @@
     where TEncodedSolution : class, IEncodedSolution {
     double[] Evaluate(TEncodedSolution solution, IRandom random);
+    double[] Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
     void Analyze(TEncodedSolution[] solutions, double[][] qualities, ResultCollection results, IRandom random);
   }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblem.cs

@@ -33 +33 @@
     where TEncoding : class, IEncoding<TEncodedSolution>
     where TEncodedSolution : class, IEncodedSolution { }
+  //TODO derive ISingleObjectiveProblem from ISingleObjectiveProblemDefinition?
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Core;
@@ -35 +36 @@
     where TEncoding : class, IEncoding<TEncodedSolution>
     where TEncodedSolution : class, IEncodedSolution {
+
     double Evaluate(TEncodedSolution solution, IRandom random);
+    double Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
+
     void Analyze(TEncodedSolution[] solutions, double[] qualities, ResultCollection results, IRandom random);
     IEnumerable<TEncodedSolution> GetNeighbors(TEncodedSolution solution, IRandom random);

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -133 +134 @@
     }
 
-    public abstract double[] Evaluate(TEncodedSolution solution, IRandom random);
+    public virtual double[] Evaluate(TEncodedSolution solution, IRandom random) {
+      return Evaluate(solution, random, CancellationToken.None);
+    }
+
+    public abstract double[] Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
     public virtual void Analyze(TEncodedSolution[] solutions, double[][] qualities, ResultCollection results, IRandom random) { }
 

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -112 +113 @@
     }
 
-    public abstract double Evaluate(TEncodedSolution solution, IRandom random);
+    public virtual double Evaluate(TEncodedSolution solution, IRandom random) {
+      return Evaluate(solution, random, CancellationToken.None);
+    }
+    public abstract double Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
     public virtual void Analyze(TEncodedSolution[] solutions, double[] qualities, ResultCollection results, IRandom random) { }
     public virtual IEnumerable<TEncodedSolution> GetNeighbors(TEncodedSolution solution, IRandom random) {