Changeset 11468 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/AlgorithmServiceNode.cs

Timestamp:

10/16/14 03:57:49 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

File:

• branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/AlgorithmServiceNode.cs (modified) (5 diffs)

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/AlgorithmServiceNode.cs

@@ -93 +93 @@
     }
 
-    protected virtual void Execute(ServiceParameterCollection parameters) {
+    protected virtual void Execute(ServiceParameterCollection parameters, CancellationToken token) {
       if (Template == null) throw new InvalidOperationException("Template is null");
 
@@ -120 +120 @@
       algorithm.Stopped += Algorithm_Stopped;
       algorithm.Start();
-      waitHandles[algorithm].WaitOne();
-
-      // retrieve results
-      foreach (var p in parameters.Where(x => x.Type == ServiceParameterType.Output)) {
-        IResult result = null;
-        if (algorithm.Results.TryGetValue(p.Name, out result)) {
-          p.Value = result.Value;
-        }
-      }
-
-      lock (locker) {
-        waitHandles[algorithm].Dispose();
-        waitHandles.Remove(algorithm);
-        Runs.Add(algorithm.Runs.ToArray()[0]);
+      if (WaitHandle.WaitAny(new WaitHandle[] { waitHandles[algorithm], token.WaitHandle }) == 1) {
+        // retrieve results
+        foreach (var p in parameters.Where(x => x.Type == ServiceParameterType.Output)) {
+          IResult result = null;
+          if (algorithm.Results.TryGetValue(p.Name, out result)) {
+            p.Value = result.Value;
+          }
+        }
+
+        lock (locker) {
+          waitHandles[algorithm].Dispose();
+          waitHandles.Remove(algorithm);
+          Runs.Add(algorithm.Runs.ToArray()[0]);
+        }
+      } else {  // cancellation
+        algorithm.Stop();
+        lock (locker) {
+          waitHandles[algorithm].Dispose();
+          waitHandles.Remove(algorithm);
+        }
       }
     }
@@ -191 +197 @@
       IServicePort s = port as IServicePort;
       if (s != null) {
-        s.Called += ServicePort_Called;
+        s.ProcessParameters += ServicePort_ProcessParameters;
       }
     }
@@ -203 +209 @@
       IServicePort s = port as IServicePort;
       if (s != null) {
-        s.Called -= ServicePort_Called;
+        s.ProcessParameters -= ServicePort_ProcessParameters;
       }
     }
@@ -212 +218 @@
       UpdateParameter((IInputPort)sender);
     }
-    private void ServicePort_Called(object sender, EventArgs<ServiceParameterCollection> e) {
-      Execute(e.Value);
+    private void ServicePort_ProcessParameters(object sender, EventArgs<ServiceParameterCollection, CancellationToken> e) {
+      Execute(e.Value, e.Value2);
     }
     #endregion