Changeset 17366 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems

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

Files:

• Interfaces/internal/ISingleObjectiveEvaluationOperator.cs (modified) (2 diffs)
• Operators/SingleObjectiveEvaluator.cs (modified) (3 diffs)
• Operators/SingleObjectiveImprover.cs (modified) (4 diffs)
• Operators/SingleObjectiveMoveEvaluator.cs (modified) (3 diffs)
• SingleObjectiveProblem.cs (modified) (1 diff)
• SolutionContext.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveEvaluationOperator.cs

@@ -21 +21 @@
 
 using System;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Core;
@@ -28 +29 @@
   internal interface ISingleObjectiveEvaluationOperator<TEncodedSolution> : ISingleObjectiveEvaluator, IEncodingOperator<TEncodedSolution>
   where TEncodedSolution : class, IEncodedSolution {
-    Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom> Evaluate { get; set; }
+    Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom, CancellationToken> Evaluate { get; set; }
   }
 }

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

@@ -21 +21 @@
 
 using System;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -46 +47 @@
     }
 
-    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom> Evaluate { get; set; }
+    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom, CancellationToken> Evaluate { get; set; }
 
     [StorableConstructor]
@@ -65 +66 @@
       var solutionContext = new SingleObjectiveSolutionContextScope<TEncodedSolution>(ExecutionContext.Scope, solution);
 
-      Evaluate(solutionContext, random);
+      Evaluate(solutionContext, random, CancellationToken.None);
       var qualityValue = solutionContext.EvaluationResult.Quality;
 

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -63 +64 @@
     }
 
-    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom> Evaluate { get; set; }
+    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom, CancellationToken> Evaluate { get; set; }
     public Func<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom, IEnumerable<ISingleObjectiveSolutionContext<TEncodedSolution>>> GetNeighbors { get; set; }
 
@@ -94 +95 @@
       double quality;
       if (QualityParameter.ActualValue == null) {
-        if (!solutionContext.IsEvaluated) Evaluate(solutionContext, random);
+        if (!solutionContext.IsEvaluated) Evaluate(solutionContext, random, CancellationToken.None);
 
         quality = solutionContext.EvaluationResult.Quality;
@@ -104 +105 @@
         var bestQuality = quality;
         foreach (var neighbor in GetNeighbors(solutionContext, random).Take(sampleSize)) {
-          Evaluate(neighbor, random);
+          Evaluate(neighbor, random, CancellationToken);
           var q = neighbor.EvaluationResult.Quality;
           count++;

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

@@ -21 +21 @@
 
 using System;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -50 +51 @@
     }
 
-    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom> Evaluate { get; set; }
+    public Action<ISingleObjectiveSolutionContext<TEncodedSolution>, IRandom, CancellationToken> Evaluate { get; set; }
 
     [StorableConstructor]
@@ -72 +73 @@
       var solutionContext = new SingleObjectiveSolutionContextScope<TEncodedSolution>(ExecutionContext.Scope, solution);
 
-      Evaluate(solutionContext, random);
+      Evaluate(solutionContext, random, CancellationToken.None);
       var qualityValue = solutionContext.EvaluationResult.Quality;
 

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

@@ -113 +113 @@
     }
 
-    public virtual double Evaluate(TEncodedSolution solution, IRandom random) {
+    public 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 Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random) {
+    public void Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random) {
       Evaluate(solutionContext, random, CancellationToken.None);
     }

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

@@ -63 +63 @@
     }
 
-    public void SetAdditionalData(string identifier, object o) {
+    public virtual void SetAdditionalData(string identifier, object o) {
       data[identifier] = o;
     }
-    public object GetAdditionalData(string identifier) {
+    public virtual object GetAdditionalData(string identifier) {
       return data[identifier];
     }