Changeset 11481 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3

Timestamp:

10/18/14 03:25:58 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3

Files:

• AlgorithmServiceNode.cs (modified) (3 diffs)
• ClientNode.cs (modified) (2 diffs)
• ClientPort.cs (modified) (1 diff)
• IClientPort.cs (modified) (1 diff)
• ServicePort.cs (modified) (2 diffs)

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

@@ -25 +25 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
-using System.Linq;
 
 namespace HeuristicLab.Optimization.Networks {
@@ -34 +34 @@
     private object locker = new object();
     private Dictionary<IAlgorithm, AutoResetEvent> waitHandles = new Dictionary<IAlgorithm,AutoResetEvent>();
+    private Dictionary<IAlgorithm, Exception> exceptions = new Dictionary<IAlgorithm, Exception>();
 
     new public PortCollection Ports {
@@ -118 +119 @@
       algorithm.Runs.Clear();
       algorithm.Prepare();
+      algorithm.ExceptionOccurred += Algorithm_ExceptionOccurred;
       algorithm.Stopped += Algorithm_Stopped;
-      algorithm.Start();
-      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);
-        }
-      }
-    }
-
+
+      using (token.Register(() => { algorithm.Stop(); })) {
+        algorithm.Start();
+        waitHandles[algorithm].WaitOne();
+      }
+
+      lock (locker) {
+        waitHandles[algorithm].Dispose();
+        waitHandles.Remove(algorithm);
+
+        Exception ex = null;
+        if (exceptions.TryGetValue(algorithm, out ex)) {
+          exceptions.Remove(algorithm);
+          throw ex;
+        }
+      }
+
+      // retrieve results
+      var run = algorithm.Runs.First();
+      foreach (var p in parameters.Where(x => x.Type == ServiceParameterType.Output)) {
+        IItem result = null;
+        if (run.Results.TryGetValue(p.Name, out result)) {
+          p.Value = result;
+        }
+      }
+
+      lock (locker) {
+        Runs.Add(run);
+      }
+    }
+
+    private void Algorithm_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+      var algorithm = (IAlgorithm)sender;
+      lock (locker) {
+        exceptions.Add(algorithm, e.Value);
+      }
+      algorithm.Stop();
+    }
     private void Algorithm_Stopped(object sender, EventArgs e) {
       lock (locker) {

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

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
-using System.Linq;
 using System.Threading.Tasks;
 
@@ -69 +67 @@
 
     public virtual async Task CallServicesAsync() {
-      await CallServicesAsync(new CancellationToken());
+      await CallServicesAsync(CancellationToken.None);
     }
     public virtual async Task CallServicesAsync(CancellationToken token) {

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

@@ -107 +107 @@
       return true;
     }
+    public void CloneServicePortParameters() {
+      Parameters.Clear();
+      foreach (var p in servicePort.Parameters) {
+        Parameters.Add((IServiceParameter)p.Clone());
+      }
+    }
     public ServiceParameterCollection PrepareParameters() {
       if (!Valid) throw new InvalidOperationException("Port configurations do not match");

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

@@ -32 +32 @@
 
     bool IsValidServicePort(IServicePort servicePort);
+    void CloneServicePortParameters();
     ServiceParameterCollection PrepareParameters();
     ServiceParameterCollection CallService(ServiceParameterCollection parameters);

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

@@ -43 +43 @@
 
     public ServiceParameterCollection Process(ServiceParameterCollection parameters) {
-      return Process(parameters, new CancellationToken());
+      return Process(parameters, CancellationToken.None);
     }
     public ServiceParameterCollection Process(ServiceParameterCollection parameters, CancellationToken token) {
@@ -49 +49 @@
     }
     public async Task<ServiceParameterCollection> ProcessAsync(ServiceParameterCollection parameters) {
-      return await ProcessAsync(parameters, new CancellationToken());
+      return await ProcessAsync(parameters, CancellationToken.None);
     }
     public async Task<ServiceParameterCollection> ProcessAsync(ServiceParameterCollection parameters, CancellationToken token) {