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

Timestamp:

10/25/14 02:54:42 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3

Files:

• AlgorithmNode.cs (added)
• HeuristicLab.Optimization.Networks-3.3.csproj (modified) (1 diff)
• Nodes/AlgorithmServiceNode.cs (modified) (5 diffs)
• Nodes/GenericNode.cs (added)
• Nodes/IGenericNode.cs (added)
• Ports/GenericPort.cs (modified) (4 diffs)
• Ports/IGenericPort.cs (modified) (1 diff)
• Ports/MessageCollection.cs (added)
• Ports/PortParameter.cs (modified) (2 diffs)
• Ports/PortParameterType.cs (modified) (1 diff)

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/HeuristicLab.Optimization.Networks-3.3.csproj

@@ -108 +108 @@
     <Compile Include="### obsolete\ServiceParameter.cs" />
     <Compile Include="### obsolete\ServiceParameterCollection.cs" />
+    <Compile Include="Nodes\GenericNode.cs" />
+    <Compile Include="Nodes\IGenericNode.cs" />
+    <Compile Include="Ports\MessageCollection.cs" />
     <Compile Include="### obsolete\ServiceParameterCollectionCollection.cs" />
     <Compile Include="### obsolete\ServiceParameterType.cs" />

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

@@ -82 +82 @@
     }
 
-    private void UpdateParameter(IInputPort port) {
-      if (template != null) {
-        IParameter param = null;
-        if (template.Parameters.TryGetValue(port.Name, out param)) {
-          IValueParameter p = param as IValueParameter;
-          if ((p != null) && (port.Value != null)) {
-            p.Value = (IItem)port.Value;
+    protected virtual void UpdateParameters(IMessage message, CancellationToken token) {
+      // set template parameters
+      lock (locker) {
+        if (template != null) {
+          foreach (var v in message.Values) {
+            IParameter param = null;
+            if (Template.Parameters.TryGetValue(v.Name, out param)) {
+              var vp = param as IValueParameter;
+              if (vp != null) vp.Value = v.Value;
+            }
+            if (Template.Problem.Parameters.TryGetValue(v.Name, out param)) {
+              var vp = param as IValueParameter;
+              if (vp != null) vp.Value = v.Value;
+            }
           }
         }
@@ -94 +101 @@
     }
 
-    protected virtual void Execute(ServiceParameterCollection parameters, CancellationToken token) {
+    protected virtual void Execute(IMessage message, CancellationToken token) {
       if (Template == null) throw new InvalidOperationException("Template is null");
 
@@ -104 +111 @@
 
       // set parameters
-      foreach (var p in parameters.Where(x => x.Type == ServiceParameterType.Input)) {
+      foreach (var v in message.Values) {
         IParameter param = null;
-        if (algorithm.Parameters.TryGetValue(p.Name, out param)) {
-          var v = param as IValueParameter;
-          if (v != null) v.Value = p.Value;
-        }
-        if (algorithm.Problem.Parameters.TryGetValue(p.Name, out param)) {
-          var v = param as IValueParameter;
-          if (v != null) v.Value = p.Value;
+        if (algorithm.Parameters.TryGetValue(v.Name, out param)) {
+          var vp = param as IValueParameter;
+          if (vp != null) vp.Value = v.Value;
+        }
+        if (algorithm.Problem.Parameters.TryGetValue(v.Name, out param)) {
+          var vp = param as IValueParameter;
+          if (vp != null) vp.Value = v.Value;
         }
       }
@@ -140 +147 @@
       // retrieve results
       var run = algorithm.Runs.First();
-      foreach (var p in parameters.Where(x => x.Type == ServiceParameterType.Output)) {
+      foreach (var v in message.Values) {
         IItem result = null;
-        if (run.Results.TryGetValue(p.Name, out result)) {
-          p.Value = result;
+        if (run.Results.TryGetValue(v.Name, out result)) {
+          v.Value = result;
         }
       }
@@ -205 +212 @@
     #region Port Events
     private void RegisterPortEvents(IPort port) {
-      IInputPort i = port as IInputPort;
-      if (i != null) {
-        i.NameChanged += InputPort_NameChanged;
-        i.ValueChanged += InputPort_ValueChanged;
-        UpdateParameter(i);
-      }
-      IServicePort s = port as IServicePort;
-      if (s != null) {
-        s.ProcessParameters += ServicePort_ProcessParameters;
-      }
-    }
-
+      IGenericPort g = port as IGenericPort;
+      if (g != null) {
+        g.MessageReceived += GenericPort_MessageReceived;
+      }
+    }
     private void DeregisterPortEvents(IPort port) {
-      IInputPort i = port as IInputPort;
-      if (i != null) {
-        i.NameChanged -= InputPort_NameChanged;
-        i.ValueChanged -= InputPort_ValueChanged;
-      }
-      IServicePort s = port as IServicePort;
-      if (s != null) {
-        s.ProcessParameters -= ServicePort_ProcessParameters;
-      }
-    }
-    private void InputPort_NameChanged(object sender, EventArgs e) {
-      UpdateParameter((IInputPort)sender);
-    }
-    private void InputPort_ValueChanged(object sender, EventArgs e) {
-      UpdateParameter((IInputPort)sender);
-    }
-    private void ServicePort_ProcessParameters(object sender, EventArgs<ServiceParameterCollection, CancellationToken> e) {
-      Execute(e.Value, e.Value2);
+      IGenericPort g = port as IGenericPort;
+      if (g != null) {
+        g.MessageReceived -= GenericPort_MessageReceived;
+      }
+    }
+    private void GenericPort_MessageReceived(object sender, EventArgs<IMessage, CancellationToken> e) {
+      var port = (IGenericPort)sender;
+      if (port.Parameters.Any(p => p.Type.HasFlag(PortParameterType.Output)))
+        Execute(e.Value, e.Value2);  // execute algorithm to compute output
+      else
+        UpdateParameters(e.Value, e.Value2);  // update template parameters
     }
     #endregion

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Ports/GenericPort.cs

@@ -65 +65 @@
       }
     }
+    [Storable]
+    protected MessageCollection messages;
+    public MessageCollection Messages {
+      get { return messages; }
+    }
 
     [StorableConstructor]
     protected GenericPort(bool deserializing) : base(deserializing) { }
-    protected GenericPort(GenericPort original, Cloner cloner) : base(original, cloner) {
+    protected GenericPort(GenericPort original, Cloner cloner)
+      : base(original, cloner) {
       connectedPort = cloner.Clone(original.connectedPort);
       portConnectionValid = original.portConnectionValid;
+      messages = cloner.Clone(original.messages);
       RegisterConnectedPortEvents();
     }
-    public GenericPort() : base("GenericPort") { }
-    public GenericPort(string name) : base(name) { }
-    public GenericPort(string name, string description) : base(name, description) { }
+    public GenericPort()
+      : base("GenericPort") {
+      portConnectionValid = true;
+      messages = new MessageCollection();
+    }
+    public GenericPort(string name)
+      : base(name) {
+      portConnectionValid = true;
+      messages = new MessageCollection();
+    }
+    public GenericPort(string name, string description)
+      : base(name, description) {
+      portConnectionValid = true;
+      messages = new MessageCollection();
+    }
 
     [StorableHook(HookType.AfterDeserialization)]
@@ -164 +183 @@
     public void SendMessage(IMessage message, CancellationToken token) {
       if (!PortConnectionValid) throw new InvalidOperationException("Port connection is not valid");
+      Messages.Add(message);
       if (ConnectedPort != null) ConnectedPort.ReceiveMessage(message, token);
       OnMessageSent(message, token);
@@ -180 +200 @@
 
     public void ReceiveMessage(IMessage message, CancellationToken token) {
+      if (!PortConnectionValid) throw new InvalidOperationException("Port connection is not valid");
+      Messages.Add(message);
       OnMessageReceived(message, token);
     }
@@ -195 +217 @@
 
     protected override void OnInterfaceChanged() {
-      PortConnectionValid = (connectedPort != null) && CanConnectToPort(connectedPort);
+      PortConnectionValid = CanConnectToPort(connectedPort);
       base.OnInterfaceChanged();
     }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Ports/IGenericPort.cs

@@ -29 +29 @@
     IConnectedPort ConnectedPort { get; set; }
     bool PortConnectionValid { get; }
+    MessageCollection Messages { get; }
 
     event EventHandler ConnectedPortChanged;

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Ports/PortParameter.cs

@@ -35 +35 @@
     public override Image ItemImage {
       get {
-        if (Type == PortParameterType.Input) return HeuristicLab.Common.Resources.VSImageLibrary.ArrowDown;
-        else if (Type == PortParameterType.Output) return HeuristicLab.Common.Resources.VSImageLibrary.ArrowUp;
-        else return base.ItemImage;
+        if (Type.HasFlag(PortParameterType.Input) && Type.HasFlag(PortParameterType.Output))
+          return HeuristicLab.Common.Resources.VSImageLibrary.Field;
+        else if (Type.HasFlag(PortParameterType.Input))
+          return HeuristicLab.Common.Resources.VSImageLibrary.ArrowDown;
+        else if (Type.HasFlag(PortParameterType.Output))
+          return HeuristicLab.Common.Resources.VSImageLibrary.ArrowUp;
+        else
+          return base.ItemImage;
       }
     }
@@ -96 +101 @@
       RegisterDefaultValueEvents();
     }
-    public PortParameter() : base("PortParameter") { }
-    public PortParameter(string name) : base(name) { }
-    public PortParameter(string name, string description) : base(name, description) { }
+    public PortParameter()
+      : base("PortParameter") {
+      type = PortParameterType.Input;
+    }
+    public PortParameter(string name)
+      : base(name) {
+      type = PortParameterType.Input;
+    }
+    public PortParameter(string name, string description)
+      : base(name, description) {
+      type = PortParameterType.Input;
+    }
 
     [StorableHook(HookType.AfterDeserialization)]

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Ports/PortParameterType.cs

@@ -25 +25 @@
   [Flags]
   public enum PortParameterType {
+    None = 0,
     Input = 1,
     Output = 2