Changeset 11468 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/ClientNode.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/ClientNode.cs (modified) (1 diff)

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

@@ -68 +68 @@
     }
 
-    public virtual void CallAsync() {
-      Task.Factory.StartNew(() => {
+    public virtual async Task CallServicesAsync() {
+      await CallServicesAsync(new CancellationToken());
+    }
+    public virtual async Task CallServicesAsync(CancellationToken token) {
+      foreach (var clientPort in Ports.OfType<IClientPort>()) {
+        var parameters = clientPort.PrepareParameters();
 
-        foreach (var clientPort in Ports.OfType<IClientPort>()) {
-          var parameters = clientPort.PrepareParameters();
+        // retrieve inputs
+        foreach (var inputPort in Ports.OfType<IInputPort>().
+                                        Where(x => parameters.ContainsKey(x.Name) &&
+                                                    parameters[x.Name].Type == ServiceParameterType.Input &&
+                                                    parameters[x.Name].DataType.IsAssignableFrom(x.DataType))) {
+          parameters[inputPort.Name].Value = (IItem)inputPort.Value.Clone();
+        }
 
-          // retrieve inputs
-          foreach (var inputPort in Ports.OfType<IInputPort>().
-                                          Where(x => parameters.ContainsKey(x.Name) &&
-                                                     parameters[x.Name].Type == ServiceParameterType.Input &&
-                                                     parameters[x.Name].DataType.IsAssignableFrom(x.DataType))) {
-            parameters[inputPort.Name].Value = (IItem)inputPort.Value.Clone();
+        parameters = await clientPort.CallServiceAsync(parameters, token);
+
+        lock (locker) {
+          // set outputs
+          foreach (var outputPort in Ports.OfType<IOutputPort>().
+                                            Where(x => parameters.ContainsKey(x.Name) &&
+                                                      parameters[x.Name].Type == ServiceParameterType.Output &&
+                                                      x.DataType.IsAssignableFrom(parameters[x.Name].DataType))) {
+            outputPort.Value = (IItem)parameters[outputPort.Name].Value.Clone();
           }
 
-          parameters = clientPort.Call(parameters);
-
-          lock (locker) {
-            // set outputs
-            foreach (var outputPort in Ports.OfType<IOutputPort>().
-                                             Where(x => parameters.ContainsKey(x.Name) &&
-                                                        parameters[x.Name].Type == ServiceParameterType.Output &&
-                                                        x.DataType.IsAssignableFrom(parameters[x.Name].DataType))) {
-              outputPort.Value = (IItem)parameters[outputPort.Name].Value.Clone();
-            }
-
-            Calls.Add(parameters);
-          }
+          Calls.Add(parameters);
         }
-      });
+      }
     }
   }