Changeset 17320 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/EvaluationCache.cs

Timestamp:

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

Author:

mkommend

Message:

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

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/EvaluationCache.cs (modified) (8 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/EvaluationCache.cs

@@ -31 +31 @@
 using System.Threading;
 using Google.ProtocolBuffers;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
@@ -36 +37 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
@@ -50 +50 @@
       private byte[] rawMessage;
 
-      private object lockObject = new object();
+      private readonly object lockObject = new object();
 
       public byte[] RawMessage {
@@ -116 +116 @@
     }
 
-    public delegate QualityMessage Evaluator(SolutionMessage message);
+    public delegate QualityMessage Evaluator(SolutionMessage message, CancellationToken cancellationToken);
     #endregion
 
@@ -124 +124 @@
 
     private HashSet<string> activeEvaluations = new HashSet<string>();
-    private object cacheLock = new object();
+    private readonly object cacheLock = new object();
     #endregion
 
@@ -221 +221 @@
     }
 
-    void CapacityChanged(object sender, EventArgs e) {
+    private void CapacityChanged(object sender, EventArgs e) {
       if (Capacity < 0)
         throw new ArgumentOutOfRangeException("Cache capacity cannot be less than zero");
@@ -240 +240 @@
     }
 
-    public QualityMessage GetValue(SolutionMessage message, Evaluator evaluate, ExtensionRegistry extensions) {
+    public QualityMessage GetValue(SolutionMessage message, Evaluator evaluate, ExtensionRegistry extensions, CancellationToken cancellationToken) {
       var entry = new CacheEntry(message.ToString());
       bool lockTaken = false;
@@ -267 +267 @@
               OnChanged();
               try {
-                entry.SetMessage(evaluate(message));
+                entry.SetMessage(evaluate(message, cancellationToken));
                 Monitor.Enter(cacheLock, ref lockTaken);
                 index[entry] = list.AddLast(entry);