Changeset 11452

Timestamp:

10/12/14 03:02:37 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Optimization.Networks.Views/3.3/AlgorithmNodeView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views/3.3/HeuristicLab.Optimization.Networks.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views/3.3/InputOutputPortView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/InputOutputPortView.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/NodeView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/NodeView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views/3.3/VariablesNodeView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/VariablesNodeView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/HeuristicLab.Optimization.Networks-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization.Networks/3.3/IInputOutputPort.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/IValuePort.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/InputOutputPort.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/InputPort.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Networks/3.3/MultiplierNode.cs (added)
• HeuristicLab.Optimization.Networks/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/VariablesNode.cs (modified) (5 diffs)

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

@@ -30 +30 @@
   [Content(typeof(AlgorithmNode), true)]
   [Content(typeof(IAlgorithmNode), false)]
-  public partial class AlgorithmNodeView : NodeView {
+  public partial class AlgorithmNodeView : EntityView {
     protected TypeSelectorDialog typeSelectorDialog;
 

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

@@ -103 +103 @@
       <DependentUpon>EntityView.cs</DependentUpon>
     </Compile>
+    <Compile Include="InputOutputPortView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="InputOutputPortView.Designer.cs">
+      <DependentUpon>InputOutputPortView.cs</DependentUpon>
+    </Compile>
     <Compile Include="PortView.cs">
       <SubType>UserControl</SubType>

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      this.portCollectionView = new HeuristicLab.Optimization.Networks.Views.PortCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -52 +53 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Location = new System.Drawing.Point(69, 0);
-      this.nameTextBox.Size = new System.Drawing.Size(551, 20);
       // 
-      // infoLabel
+      // portCollectionView
       // 
-      this.infoLabel.Location = new System.Drawing.Point(626, 3);
+      this.portCollectionView.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.portCollectionView.Caption = "PortCollection View";
+      this.portCollectionView.Content = null;
+      this.portCollectionView.Location = new System.Drawing.Point(0, 26);
+      this.portCollectionView.Name = "portCollectionView";
+      this.portCollectionView.ReadOnly = false;
+      this.portCollectionView.ShowDetails = true;
+      this.portCollectionView.Size = new System.Drawing.Size(645, 491);
+      this.portCollectionView.TabIndex = 3;
       // 
       // NodeView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.portCollectionView);
       this.Name = "NodeView";
-      this.Size = new System.Drawing.Size(645, 517);
+      this.Controls.SetChildIndex(this.nameLabel, 0);
+      this.Controls.SetChildIndex(this.nameTextBox, 0);
+      this.Controls.SetChildIndex(this.infoLabel, 0);
+      this.Controls.SetChildIndex(this.portCollectionView, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
@@ -72 +85 @@
     #endregion
 
+    protected PortCollectionView portCollectionView;
+
+
 
 

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

@@ -38 +38 @@
     }
 
-    protected override void DeregisterContentEvents() {
-      // remove events here
-      base.DeregisterContentEvents();
-    }
-
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      // add events here
-    }
-
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      //...
+      portCollectionView.Content = Content == null ? null : Content.Ports;
     }
 
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      //...
+      portCollectionView.Enabled = Content != null && !ReadOnly;
     }
   }

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.portCollectionView = new HeuristicLab.Optimization.Networks.Views.PortCollectionView();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.variableCollectionView = new HeuristicLab.Core.Views.VariableCollectionView();
+      this.portCollectionView = new HeuristicLab.Optimization.Networks.Views.PortCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
@@ -59 +59 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      // 
-      // portCollectionView
-      // 
-      this.portCollectionView.Caption = "PortCollection View";
-      this.portCollectionView.Content = null;
-      this.portCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.portCollectionView.Location = new System.Drawing.Point(0, 0);
-      this.portCollectionView.Name = "portCollectionView";
-      this.portCollectionView.ReadOnly = false;
-      this.portCollectionView.ShowDetails = true;
-      this.portCollectionView.Size = new System.Drawing.Size(645, 238);
-      this.portCollectionView.TabIndex = 0;
       // 
       // splitContainer
@@ -89 +77 @@
       this.splitContainer.Panel2.Controls.Add(this.variableCollectionView);
       this.splitContainer.Size = new System.Drawing.Size(645, 491);
-      this.splitContainer.SplitterDistance = 238;
+      this.splitContainer.SplitterDistance = 237;
       this.splitContainer.TabIndex = 3;
       // 
@@ -101 +89 @@
       this.variableCollectionView.ReadOnly = false;
       this.variableCollectionView.ShowDetails = true;
-      this.variableCollectionView.Size = new System.Drawing.Size(645, 249);
+      this.variableCollectionView.Size = new System.Drawing.Size(645, 250);
       this.variableCollectionView.TabIndex = 0;
+      // 
+      // portCollectionView
+      // 
+      this.portCollectionView.Caption = "PortCollection View";
+      this.portCollectionView.Content = null;
+      this.portCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.portCollectionView.Location = new System.Drawing.Point(0, 0);
+      this.portCollectionView.Name = "portCollectionView";
+      this.portCollectionView.ReadOnly = false;
+      this.portCollectionView.ShowDetails = true;
+      this.portCollectionView.Size = new System.Drawing.Size(645, 237);
+      this.portCollectionView.TabIndex = 0;
       // 
       // VariablesNodeView
@@ -125 +125 @@
     #endregion
 
-    protected PortCollectionView portCollectionView;
     protected System.Windows.Forms.SplitContainer splitContainer;
     protected Core.Views.VariableCollectionView variableCollectionView;
+    private PortCollectionView portCollectionView;
 
 

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

@@ -30 +30 @@
   [Content(typeof(VariablesNode), true)]
   [Content(typeof(IVariablesNode), false)]
-  public partial class VariablesNodeView : NodeView {
+  public partial class VariablesNodeView : EntityView {
     public new IVariablesNode Content {
       get { return (IVariablesNode)base.Content; }

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

@@ -89 +89 @@
     <Compile Include="Entity.cs" />
     <Compile Include="Port.cs" />
+    <Compile Include="MultiplierNode.cs" />
     <Compile Include="VariablesNode.cs" />
     <Compile Include="EventArgs.cs" />
@@ -134 +135 @@
       <Name>HeuristicLab.Core-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
+      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
+      <Name>HeuristicLab.Data-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>

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

@@ -25 +25 @@
 namespace HeuristicLab.Optimization.Networks {
   public interface IInputOutputPort : IValuePort {
-    IOutputInputPort OutputInputPort { get; }
+    IOutputInputPort OutputInputPort { get; set; }
 
     event EventHandler OutputInputPortChanged;

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

@@ -25 +25 @@
 namespace HeuristicLab.Optimization.Networks {
   public interface IValuePort : IPort {
-    //DISCUSS: Should there be a reference to the node of this port?
-
     object Value { get; }
 

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

@@ -46 +46 @@
     IOutputInputPort IInputOutputPort.OutputInputPort {
       get { return outputInputPort; }
+      set {
+        var val = value as IOutputInputPort<TIn, TOut>;
+        if ((value != null) && (val == null))
+          throw new InvalidOperationException(
+            string.Format("Type mismatch. OutputInputPort is not a \"{0}\".",
+                          typeof(IOutputInputPort<TIn, TOut>).GetPrettyName())
+          );
+        OutputInputPort = val;
+      }
     }
 

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

@@ -44 +44 @@
           RegisterOutputPortEvents();
           OnOutputPortChanged();
+          UpdateValue();
         }
       }
@@ -79 +80 @@
     }
 
+    protected virtual void UpdateValue() {
+      if (OutputPort != null) {
+        var value = OutputPort.Value;
+        if (value != null)
+          value = (T)value.Clone();
+        Value = value;
+        //DISCUSS: clone value?
+        //DISCUSS: switch threads to decouple value propagation and to make communication asynchronous -> should be done in Node?
+      }
+    }
+
     public event EventHandler OutputPortChanged;
     protected void OnOutputPortChanged() {
@@ -96 +108 @@
     }
     protected void OutputPort_ValueChanged(object sender, EventArgs e) {
-      var value = OutputPort.Value;
-      if (value != null)
-        value = (T)value.Clone();
-      Value = value;
-      //DISCUSS: clone value?
-      //DISCUSS: switch threads to decouple value propagation and to make communication asynchronous -> should be done in Node?
+      UpdateValue();
     }
   }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Plugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]

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

@@ -77 +77 @@
 
     private void UpdateVariable(IInputPort port) {
-      IVariable var = null;
-      if (variables.TryGetValue(port.Name, out var)) {
-        var.Value = (IItem)port.Value;
-      }
+      if (!variables.ContainsKey(port.Name))
+        variables.Add(new Variable(port.Name));
+      variables[port.Name].Value = (IItem)port.Value;
     }
     private void UpdateOutputPort(IVariable variable) {
       IPort port = null;
       if (Ports.TryGetValue(variable.Name, out port)) {
-        IOutputPort p = port as IOutputPort;
-        if (p != null) {
-          p.Value = variable.Value;
+        IOutputPort o = port as IOutputPort;
+        if (o != null) {
+          o.Value = variable.Value;
+        }
+        IOutputInputPort oi = port as IOutputInputPort;
+        if (oi != null) {
+          var result = (IItem)oi.SendValue(variable.Value);
+          if (!variables.ContainsKey(oi.Name + "Result"))
+            variables.Add(new Variable(oi.Name + "Result"));
+          variables[oi.Name + "Result"].Value = result;
         }
       }
@@ -98 +104 @@
         port.Value = null;
       }
+    }
+    private void UpdateOutputInputPort(IOutputInputPort port) {
+      IVariable var = null;
+      IItem result = null;
+      if (variables.TryGetValue(port.Name, out var)) {
+        result = (IItem)port.SendValue(var.Value);
+      } else {
+        result = (IItem)port.SendValue(null);
+      }
+      if (!variables.ContainsKey(port.Name + "Result"))
+        variables.Add(new Variable(port.Name + "Result"));
+      variables[port.Name + "Result"].Value = result;
     }
 
@@ -145 +163 @@
         UpdateOutputPort(o);
       }
+      IOutputInputPort oi = port as IOutputInputPort;
+      if (oi != null) {
+        oi.NameChanged += OutputInputPort_NameChanged;
+        UpdateOutputInputPort(oi);
+      }
     }
     private void DeregisterPortEvents(IPort port) {
@@ -156 +179 @@
         o.NameChanged -= OutputPort_NameChanged;
       }
+      IOutputInputPort oi = port as IOutputInputPort;
+      if (oi != null) {
+        oi.NameChanged -= OutputInputPort_NameChanged;
+      }
     }
     private void InputPort_NameChanged(object sender, EventArgs e) {
@@ -165 +192 @@
     private void OutputPort_NameChanged(object sender, EventArgs e) {
       UpdateOutputPort((IOutputPort)sender);
+    }
+    private void OutputInputPort_NameChanged(object sender, EventArgs e) {
+      UpdateOutputInputPort((IOutputInputPort)sender);
     }
     #endregion