Changeset 11539 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks

Timestamp:

11/12/14 03:02:33 (10 years ago)

Author:

swagner

Message:

#2205: Small UI tweaks and bug fixes

File:

• branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Core.Networks/MessagePort.cs (modified) (3 diffs)

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Core.Networks/MessagePort.cs

@@ -132 +132 @@
       var message = new Message();
 
-      // collect parameters from local port
-      message.Values.AddRange(Parameters.Select(p => p.CreateMessageValue()));
+      // collect output parameters from local port
+      message.Values.AddRange(
+        Parameters
+          .Where(p => p.Type.HasFlag(PortParameterType.Output))
+          .Select(p => p.CreateMessageValue())
+      );
 
       // collect remaining parameters from connected port
@@ -144 +148 @@
       }
 
+      // collect remaining input parameters from local port
+      message.Values.AddRange(
+        Parameters
+          .Where(p => p.Type.HasFlag(PortParameterType.Input) && !message.Values.ContainsKey(p.Name))
+          .Select(p => p.CreateMessageValue())
+      );
+
       return message;
     }
@@ -151 +162 @@
     public void SendMessage(IMessage message, CancellationToken token) {
       if (!PortConnectionValid) throw new InvalidOperationException("Port connection is not valid");
+      if (ConnectedPort != null) ConnectedPort.ReceiveMessage(message, token);
       LastMessage = message;
-      if (ConnectedPort != null) ConnectedPort.ReceiveMessage(message, token);
       OnMessageSent(message, token);
     }