Changeset 11501 for branches

Timestamp:

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

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks

Files:

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

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/GenericPortView.Designer.cs

@@ -39 +39 @@
       this.connectedPortView = new HeuristicLab.Optimization.Networks.Views.PortView();
       this.cloneConnectedPortParametersButton = new System.Windows.Forms.Button();
+      this.sendMessageButton = new System.Windows.Forms.Button();
+      this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.portParameterCollectionView = new HeuristicLab.Optimization.Networks.Views.PortParameterCollectionView();
+      this.messageCollectionView = new HeuristicLab.Optimization.Networks.Views.MessageCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.connectedPortGroupBox.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
+      this.splitContainer.Panel1.SuspendLayout();
+      this.splitContainer.Panel2.SuspendLayout();
+      this.splitContainer.SuspendLayout();
       this.SuspendLayout();
-      // 
-      // portParameterCollectionView
-      // 
-      this.portParameterCollectionView.Location = new System.Drawing.Point(0, 82);
-      this.portParameterCollectionView.Size = new System.Drawing.Size(645, 435);
-      this.portParameterCollectionView.TabIndex = 4;
       // 
       // nameTextBox
@@ -53 +55 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Location = new System.Drawing.Point(71, 0);
-      this.nameTextBox.Size = new System.Drawing.Size(549, 20);
+      this.nameTextBox.Location = new System.Drawing.Point(47, 0);
+      this.nameTextBox.Size = new System.Drawing.Size(573, 20);
       // 
       // connectedPortGroupBox
@@ -63 +65 @@
       this.connectedPortGroupBox.Controls.Add(this.clearConnectedPortButton);
       this.connectedPortGroupBox.Controls.Add(this.connectedPortView);
-      this.connectedPortGroupBox.Location = new System.Drawing.Point(0, 26);
+      this.connectedPortGroupBox.Location = new System.Drawing.Point(47, 26);
       this.connectedPortGroupBox.Name = "connectedPortGroupBox";
-      this.connectedPortGroupBox.Size = new System.Drawing.Size(645, 50);
-      this.connectedPortGroupBox.TabIndex = 3;
+      this.connectedPortGroupBox.Size = new System.Drawing.Size(598, 50);
+      this.connectedPortGroupBox.TabIndex = 4;
       this.connectedPortGroupBox.TabStop = false;
       this.connectedPortGroupBox.Text = "&Connected Port";
@@ -101 +103 @@
       this.connectedPortView.Name = "connectedPortView";
       this.connectedPortView.ReadOnly = true;
-      this.connectedPortView.Size = new System.Drawing.Size(554, 23);
+      this.connectedPortView.Size = new System.Drawing.Size(507, 23);
       this.connectedPortView.TabIndex = 2;
       this.connectedPortView.DragDrop += new System.Windows.Forms.DragEventHandler(this.connectedPortView_DragDrop);
@@ -118 +120 @@
       this.cloneConnectedPortParametersButton.Click += new System.EventHandler(this.cloneConnectedPortParametersButton_Click);
       // 
+      // sendMessageButton
+      // 
+      this.sendMessageButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Exception;
+      this.sendMessageButton.Location = new System.Drawing.Point(6, 45);
+      this.sendMessageButton.Name = "sendMessageButton";
+      this.sendMessageButton.Size = new System.Drawing.Size(24, 24);
+      this.sendMessageButton.TabIndex = 3;
+      this.toolTip.SetToolTip(this.sendMessageButton, "Send Message");
+      this.sendMessageButton.UseVisualStyleBackColor = true;
+      this.sendMessageButton.Click += new System.EventHandler(this.sendMessageButton_Click);
+      // 
+      // splitContainer
+      // 
+      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.splitContainer.Location = new System.Drawing.Point(0, 82);
+      this.splitContainer.Name = "splitContainer";
+      this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
+      // 
+      // splitContainer.Panel1
+      // 
+      this.splitContainer.Panel1.Controls.Add(this.portParameterCollectionView);
+      // 
+      // splitContainer.Panel2
+      // 
+      this.splitContainer.Panel2.Controls.Add(this.messageCollectionView);
+      this.splitContainer.Size = new System.Drawing.Size(645, 435);
+      this.splitContainer.SplitterDistance = 218;
+      this.splitContainer.TabIndex = 7;
+      // 
+      // portParameterCollectionView
+      // 
+      this.portParameterCollectionView.Caption = "PortParameterCollection View";
+      this.portParameterCollectionView.Content = null;
+      this.portParameterCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.portParameterCollectionView.Location = new System.Drawing.Point(0, 0);
+      this.portParameterCollectionView.Name = "portParameterCollectionView";
+      this.portParameterCollectionView.ReadOnly = false;
+      this.portParameterCollectionView.ShowDetails = true;
+      this.portParameterCollectionView.Size = new System.Drawing.Size(645, 218);
+      this.portParameterCollectionView.TabIndex = 0;
+      // 
+      // messageCollectionView
+      // 
+      this.messageCollectionView.Caption = "MessageCollection View";
+      this.messageCollectionView.Content = null;
+      this.messageCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.messageCollectionView.Location = new System.Drawing.Point(0, 0);
+      this.messageCollectionView.Name = "messageCollectionView";
+      this.messageCollectionView.ReadOnly = false;
+      this.messageCollectionView.ShowDetails = true;
+      this.messageCollectionView.Size = new System.Drawing.Size(645, 213);
+      this.messageCollectionView.TabIndex = 0;
+      // 
       // GenericPortView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.sendMessageButton);
       this.Controls.Add(this.cloneConnectedPortParametersButton);
       this.Controls.Add(this.connectedPortGroupBox);
+      this.Controls.Add(this.splitContainer);
       this.Name = "GenericPortView";
-      this.Controls.SetChildIndex(this.portParameterCollectionView, 0);
+      this.Controls.SetChildIndex(this.splitContainer, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
@@ -130 +189 @@
       this.Controls.SetChildIndex(this.connectedPortGroupBox, 0);
       this.Controls.SetChildIndex(this.cloneConnectedPortParametersButton, 0);
+      this.Controls.SetChildIndex(this.sendMessageButton, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.connectedPortGroupBox.ResumeLayout(false);
+      this.splitContainer.Panel1.ResumeLayout(false);
+      this.splitContainer.Panel2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
+      this.splitContainer.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -144 +208 @@
     protected System.Windows.Forms.Button setConnectedPortButton;
     protected System.Windows.Forms.Button cloneConnectedPortParametersButton;
+    protected System.Windows.Forms.Button sendMessageButton;
+    protected System.Windows.Forms.SplitContainer splitContainer;
+    protected PortParameterCollectionView portParameterCollectionView;
+    protected MessageCollectionView messageCollectionView;
 
 

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/GenericPortView.cs

@@ -29 +29 @@
   [Content(typeof(GenericPort), true)]
   [Content(typeof(IGenericPort), false)]
-  public partial class GenericPortView : ParameterizedPortView {
+  public partial class GenericPortView : PortView {
     protected EntitySelectorDialog entitySelectorDialog;
 
@@ -52 +52 @@
 
     protected override void DeregisterContentEvents() {
+      Content.InterfaceChanged -= Content_InterfaceChanged;
       Content.ConnectedPortChanged -= Content_ConnectedPortChanged;
       base.DeregisterContentEvents();
@@ -57 +58 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
+      Content.InterfaceChanged += Content_InterfaceChanged;
       Content.ConnectedPortChanged += Content_ConnectedPortChanged;
     }
@@ -63 +65 @@
       base.OnContentChanged();
       connectedPortView.Content = Content == null ? null : Content.ConnectedPort;
+      portParameterCollectionView.Content = Content == null ? null : Content.Parameters;
+      messageCollectionView.Content = Content == null ? null : Content.Messages;
       errorProvider.SetError(connectedPortView, ((Content == null) || Content.PortConnectionValid) ? string.Empty : "Port connection is not valid");
     }
@@ -68 +72 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      sendMessageButton.Enabled = Content != null;
       connectedPortGroupBox.Enabled = Content != null && !ReadOnly;
       setConnectedPortButton.Enabled = Content != null && !ReadOnly;
       clearConnectedPortButton.Enabled = Content != null && Content.ConnectedPort != null && !ReadOnly;
+      portParameterCollectionView.Enabled = Content != null && !ReadOnly;
       cloneConnectedPortParametersButton.Enabled = Content != null && Content.ConnectedPort != null && !ReadOnly;
+      messageCollectionView.Enabled = Content != null && !ReadOnly;
     }
 
@@ -83 +90 @@
       }
     }
-    protected override void Content_InterfaceChanged(object sender, EventArgs e) {
+    protected virtual void Content_InterfaceChanged(object sender, EventArgs e) {
       if (InvokeRequired)
         Invoke(new EventHandler(Content_InterfaceChanged), sender, e);
       else {
-        base.Content_InterfaceChanged(sender, e);
         errorProvider.SetError(connectedPortView, Content.PortConnectionValid ? string.Empty : "Port connection is not valid");
       }
+    }
+
+    protected virtual void sendMessageButton_Click(object sender, EventArgs e) {
+      Content.SendMessageAsync(Content.PrepareMessage());
     }
 

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

@@ -115 +115 @@
       <DependentUpon>InputPortView.cs</DependentUpon>
     </Compile>
+    <Compile Include="MessageCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MessageCollectionView.Designer.cs">
+      <DependentUpon>MessageCollectionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="### obsolete\ServiceParameterCollectionCollectionView.cs">
       <SubType>UserControl</SubType>
@@ -168 +174 @@
     <Compile Include="MessageView.Designer.cs">
       <DependentUpon>MessageView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GenericNodeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GenericNodeView.Designer.cs">
+      <DependentUpon>GenericNodeView.cs</DependentUpon>
     </Compile>
     <Compile Include="ParameterizedPortView.cs">

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