Changeset 11449 for branches

Timestamp:

10/11/14 03:32:15 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Optimization.Networks.Views/3.3/EntitySelector.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/EntitySelector.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/EntitySelectorDialog.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/EntitySelectorDialog.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/EntityView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/EntityView.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/HeuristicLab.Optimization.Networks.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views/3.3/InputPortView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/InputPortView.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/NetworkView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views/3.3/NodeView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views/3.3/PortView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/PortView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/ValuePortView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Optimization.Networks/3.3/Entity.cs (added)
• HeuristicLab.Optimization.Networks/3.3/HeuristicLab.Optimization.Networks-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/IEntity.cs (added)
• HeuristicLab.Optimization.Networks/3.3/INode.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/IPort.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/Network.cs (modified) (4 diffs)
• HeuristicLab.Optimization.Networks/3.3/Node.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/Port.cs (modified) (2 diffs)

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

@@ -85 +85 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="EntitySelector.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EntitySelector.Designer.cs">
+      <DependentUpon>EntitySelector.cs</DependentUpon>
+    </Compile>
+    <Compile Include="EntitySelectorDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="EntitySelectorDialog.Designer.cs">
+      <DependentUpon>EntitySelectorDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="EntityView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EntityView.Designer.cs">
+      <DependentUpon>EntityView.cs</DependentUpon>
+    </Compile>
     <Compile Include="PortView.cs">
       <SubType>UserControl</SubType>

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

@@ -27 +27 @@
     private System.ComponentModel.IContainer components = null;
 
-    /// <summary> 
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing) {
-      if (disposing) {
-        if (components != null) components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
     #region Component Designer generated code
 
@@ -45 +34 @@
     /// </summary>
     private void InitializeComponent() {
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InputPortView));
       this.outputPortGroupBox = new System.Windows.Forms.GroupBox();
+      this.setOutputPortButton = new System.Windows.Forms.Button();
+      this.clearOutputPortButton = new System.Windows.Forms.Button();
       this.outputPortView = new HeuristicLab.Optimization.Networks.Views.PortView();
       this.valueGroupBox.SuspendLayout();
@@ -55 +47 @@
       // valueGroupBox
       // 
-      this.valueGroupBox.Location = new System.Drawing.Point(0, 129);
-      this.valueGroupBox.Size = new System.Drawing.Size(645, 388);
-      this.valueGroupBox.TabIndex = 6;
+      this.valueGroupBox.Location = new System.Drawing.Point(0, 82);
+      this.valueGroupBox.Size = new System.Drawing.Size(645, 435);
+      this.valueGroupBox.TabIndex = 4;
       // 
       // valuePanel
       // 
-      this.valuePanel.Size = new System.Drawing.Size(633, 363);
+      this.valuePanel.Size = new System.Drawing.Size(633, 410);
       // 
       // valueViewHost
       // 
-      this.valueViewHost.Size = new System.Drawing.Size(633, 363);
-      // 
-      // pathTextBox
-      // 
-      this.pathTextBox.Location = new System.Drawing.Point(71, 26);
-      this.pathTextBox.Size = new System.Drawing.Size(549, 20);
+      this.valueViewHost.Size = new System.Drawing.Size(633, 410);
       // 
       // nameTextBox
@@ -83 +70 @@
       this.outputPortGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+      this.outputPortGroupBox.Controls.Add(this.setOutputPortButton);
+      this.outputPortGroupBox.Controls.Add(this.clearOutputPortButton);
       this.outputPortGroupBox.Controls.Add(this.outputPortView);
-      this.outputPortGroupBox.Location = new System.Drawing.Point(0, 52);
+      this.outputPortGroupBox.Location = new System.Drawing.Point(0, 26);
       this.outputPortGroupBox.Name = "outputPortGroupBox";
-      this.outputPortGroupBox.Size = new System.Drawing.Size(645, 71);
-      this.outputPortGroupBox.TabIndex = 5;
+      this.outputPortGroupBox.Size = new System.Drawing.Size(645, 50);
+      this.outputPortGroupBox.TabIndex = 3;
       this.outputPortGroupBox.TabStop = false;
       this.outputPortGroupBox.Text = "&Output Port";
-      this.outputPortGroupBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.outputPortGroupBox_DragDrop);
-      this.outputPortGroupBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.outputPortGroupBox_DragEnterOver);
-      this.outputPortGroupBox.DragOver += new System.Windows.Forms.DragEventHandler(this.outputPortGroupBox_DragEnterOver);
+      // 
+      // setOutputPortButton
+      // 
+      this.setOutputPortButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Edit;
+      this.setOutputPortButton.Location = new System.Drawing.Point(6, 19);
+      this.setOutputPortButton.Name = "setOutputPortButton";
+      this.setOutputPortButton.Size = new System.Drawing.Size(24, 24);
+      this.setOutputPortButton.TabIndex = 0;
+      this.setOutputPortButton.UseVisualStyleBackColor = true;
+      this.setOutputPortButton.Click += new System.EventHandler(this.setOutputPortButton_Click);
+      // 
+      // clearOutputPortButton
+      // 
+      this.clearOutputPortButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove;
+      this.clearOutputPortButton.Location = new System.Drawing.Point(36, 19);
+      this.clearOutputPortButton.Name = "clearOutputPortButton";
+      this.clearOutputPortButton.Size = new System.Drawing.Size(24, 24);
+      this.clearOutputPortButton.TabIndex = 1;
+      this.clearOutputPortButton.UseVisualStyleBackColor = true;
+      this.clearOutputPortButton.Click += new System.EventHandler(this.clearOutputPortButton_Click);
       // 
       // outputPortView
       // 
-      this.outputPortView.Caption = "Port View";
+      this.outputPortView.AllowDrop = true;
+      this.outputPortView.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.outputPortView.Caption = "Output Port View";
       this.outputPortView.Content = null;
-      this.outputPortView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.outputPortView.Location = new System.Drawing.Point(3, 16);
+      this.outputPortView.Location = new System.Drawing.Point(66, 21);
       this.outputPortView.Name = "outputPortView";
       this.outputPortView.ReadOnly = true;
-      this.outputPortView.Size = new System.Drawing.Size(639, 52);
-      this.outputPortView.TabIndex = 0;
+      this.outputPortView.Size = new System.Drawing.Size(573, 23);
+      this.outputPortView.TabIndex = 2;
+      this.outputPortView.DragDrop += new System.Windows.Forms.DragEventHandler(this.outputPortView_DragDrop);
+      this.outputPortView.DragEnter += new System.Windows.Forms.DragEventHandler(this.outputPortView_DragEnterOver);
+      this.outputPortView.DragOver += new System.Windows.Forms.DragEventHandler(this.outputPortView_DragEnterOver);
       // 
       // InputPortView
@@ -110 +122 @@
       this.Controls.Add(this.outputPortGroupBox);
       this.Name = "InputPortView";
-      this.Controls.SetChildIndex(this.pathLabel, 0);
-      this.Controls.SetChildIndex(this.pathTextBox, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
@@ -130 +140 @@
     protected System.Windows.Forms.GroupBox outputPortGroupBox;
     protected PortView outputPortView;
+    protected System.Windows.Forms.Button clearOutputPortButton;
+    protected System.Windows.Forms.Button setOutputPortButton;
 
 

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

@@ -30 +30 @@
   [Content(typeof(IInputPort), false)]
   public partial class InputPortView : ValuePortView {
+    protected EntitySelectorDialog entitySelectorDialog;
+
     public new IInputPort Content {
       get { return (IInputPort)base.Content; }
@@ -37 +39 @@
     public InputPortView() {
       InitializeComponent();
+    }
+
+    protected override void Dispose(bool disposing) {
+      if (disposing) {
+        if (entitySelectorDialog != null) entitySelectorDialog.Dispose();
+        if (components != null) components.Dispose();
+      }
+      base.Dispose(disposing);
     }
 
@@ -56 +66 @@
       base.SetEnabledStateOfControls();
       outputPortGroupBox.Enabled = Content != null && !ReadOnly;
+      setOutputPortButton.Enabled = Content != null && !ReadOnly;
+      clearOutputPortButton.Enabled = Content != null && Content.OutputPort != null && !ReadOnly;
     }
 
@@ -62 +74 @@
         Invoke(new EventHandler(Content_OutputPortChanged), sender, e);
       else {
+        clearOutputPortButton.Enabled = Content.OutputPort != null && !ReadOnly;
         outputPortView.Content = Content.OutputPort;
       }
     }
 
-    protected virtual void outputPortGroupBox_DragEnterOver(object sender, DragEventArgs e) {
+    protected virtual void setOutputPortButton_Click(object sender, EventArgs e) {
+      if (entitySelectorDialog == null) {
+        entitySelectorDialog = new EntitySelectorDialog();
+        entitySelectorDialog.Caption = "Select Output Port";
+      }
+
+      IEntity root = Content;
+      while (root.Parent != null)
+        root = root.Parent;
+      entitySelectorDialog.EntitySelector.Root = root;
+
+      if (entitySelectorDialog.ShowDialog(this) == DialogResult.OK) {
+        Content.OutputPort = entitySelectorDialog.EntitySelector.SelectedEntity as IOutputPort;
+      }
+    }
+    protected virtual void clearOutputPortButton_Click(object sender, EventArgs e) {
+      Content.OutputPort = null;
+    }
+
+    protected virtual void outputPortView_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       if (!ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IOutputPort)) {
@@ -72 +104 @@
       }
     }
-    protected virtual void outputPortGroupBox_DragDrop(object sender, DragEventArgs e) {
+    protected virtual void outputPortView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         IOutputPort port = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IOutputPort;

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

@@ -28 +28 @@
   [Content(typeof(Network), true)]
   [Content(typeof(INetwork), false)]
-  public partial class NetworkView : NamedItemView {
+  public partial class NetworkView : EntityView {
     public new INetwork Content {
       get { return (INetwork)base.Content; }

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

@@ -28 +28 @@
   [Content(typeof(Node), true)]
   [Content(typeof(INode), false)]
-  public partial class NodeView : NamedItemView {
+  public partial class NodeView : EntityView {
     public new INode Content {
       get { return (INode)base.Content; }

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.pathLabel = new System.Windows.Forms.Label();
-      this.pathTextBox = new System.Windows.Forms.TextBox();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -54 +52 @@
       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
-      // 
-      this.infoLabel.Location = new System.Drawing.Point(626, 3);
-      // 
-      // pathLabel
-      // 
-      this.pathLabel.AutoSize = true;
-      this.pathLabel.Location = new System.Drawing.Point(3, 29);
-      this.pathLabel.Name = "pathLabel";
-      this.pathLabel.Size = new System.Drawing.Size(32, 13);
-      this.pathLabel.TabIndex = 3;
-      this.pathLabel.Text = "&Path:";
-      // 
-      // pathTextBox
-      // 
-      this.pathTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.pathTextBox.Location = new System.Drawing.Point(69, 26);
-      this.pathTextBox.Name = "pathTextBox";
-      this.pathTextBox.ReadOnly = true;
-      this.pathTextBox.Size = new System.Drawing.Size(551, 20);
-      this.pathTextBox.TabIndex = 4;
       // 
       // PortView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.Controls.Add(this.pathTextBox);
-      this.Controls.Add(this.pathLabel);
       this.Name = "PortView";
-      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.pathLabel, 0);
-      this.Controls.SetChildIndex(this.pathTextBox, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
@@ -100 +65 @@
     #endregion
 
-    protected System.Windows.Forms.Label pathLabel;
-    protected System.Windows.Forms.TextBox pathTextBox;
 
 

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

@@ -29 +29 @@
   [Content(typeof(Port), true)]
   [Content(typeof(IPort), false)]
-  public partial class PortView : NamedItemView {
+  public partial class PortView : EntityView {
     public new IPort Content {
       get { return (IPort)base.Content; }
@@ -39 +39 @@
     }
 
-    protected override void DeregisterContentEvents() {
-      Content.PathChanged -= Content_PathChanged;
-      base.DeregisterContentEvents();
-    }
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      Content.PathChanged += Content_PathChanged;
-    }
-
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      pathTextBox.Text = Content == null ? string.Empty : Content.Path;
     }
 
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      pathTextBox.Enabled = Content != null;
-    }
-
-    protected virtual void Content_PathChanged(object sender, System.EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_PathChanged), sender, e);
-      else {
-        pathTextBox.Text = Content.Path;
-      }
     }
   }

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

@@ -64 +64 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.valueGroupBox.Controls.Add(this.valuePanel);
-      this.valueGroupBox.Location = new System.Drawing.Point(0, 52);
+      this.valueGroupBox.Location = new System.Drawing.Point(0, 26);
       this.valueGroupBox.Name = "valueGroupBox";
-      this.valueGroupBox.Size = new System.Drawing.Size(645, 465);
-      this.valueGroupBox.TabIndex = 5;
+      this.valueGroupBox.Size = new System.Drawing.Size(645, 491);
+      this.valueGroupBox.TabIndex = 3;
       this.valueGroupBox.TabStop = false;
       this.valueGroupBox.Text = "Value";
@@ -79 +79 @@
       this.valuePanel.Location = new System.Drawing.Point(6, 19);
       this.valuePanel.Name = "valuePanel";
-      this.valuePanel.Size = new System.Drawing.Size(633, 440);
+      this.valuePanel.Size = new System.Drawing.Size(633, 466);
       this.valuePanel.TabIndex = 0;
       // 
@@ -91 +91 @@
       this.valueViewHost.Name = "valueViewHost";
       this.valueViewHost.ReadOnly = false;
-      this.valueViewHost.Size = new System.Drawing.Size(633, 440);
+      this.valueViewHost.Size = new System.Drawing.Size(633, 466);
       this.valueViewHost.TabIndex = 0;
       this.valueViewHost.ViewsLabelVisible = true;
@@ -101 +101 @@
       this.Controls.Add(this.valueGroupBox);
       this.Name = "ValuePortView";
-      this.Controls.SetChildIndex(this.pathLabel, 0);
-      this.Controls.SetChildIndex(this.pathTextBox, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);

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

@@ -84 +84 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IEntity.cs" />
     <Compile Include="IPort.cs" />
     <Compile Include="IVariablesNode.cs" />
+    <Compile Include="Entity.cs" />
     <Compile Include="Port.cs" />
     <Compile Include="VariablesNode.cs" />

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

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization.Networks {
-  public interface INode : INamedItem {
+  public interface INode : IEntity {
+    new INetwork Parent { get; set; }
     IKeyedItemCollection<string, IPort> Ports { get; }
   }

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

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization.Networks {
-  public interface IPort : INamedItem {
-    INode Parent { get; set; }
-    string Path { get; }
-
-    event EventHandler PathChanged;
+  public interface IPort : IEntity {
+    new INode Parent { get; set; }
   }
 }

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

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 
 namespace HeuristicLab.Optimization.Networks {
@@ -34 +36 @@
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
+    }
+
+    public override IEnumerable<IEntity> Children {
+      get { return base.Children.Concat(Nodes.AsEnumerable<IEntity>()); }
     }
 
@@ -47 +53 @@
       : base(original, cloner) {
       nodes = cloner.Clone(original.nodes);
+      foreach (var n in Nodes)
+        n.Parent = this;
+      RegisterNodesEvents();
     }
     public Network()
       : base("Network") {
       nodes = new NodeCollection();
+      RegisterNodesEvents();
     }
     public Network(string name)
       : base(name) {
       nodes = new NodeCollection();
+      RegisterNodesEvents();
     }
     public Network(string name, string description)
       : base(name, description) {
       nodes = new NodeCollection();
+      RegisterNodesEvents();
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      foreach (var n in Nodes)
+        n.Parent = this;
+      RegisterNodesEvents();
     }
 
@@ -64 +83 @@
       return new Network(this, cloner);
     }
+
+    #region Nodes Events
+    protected virtual void RegisterNodesEvents() {
+      nodes.ItemsAdded += Nodes_ItemsAdded;
+      nodes.ItemsRemoved += Nodes_ItemsRemoved;
+      nodes.ItemsReplaced += Nodes_ItemsReplaced;
+      nodes.CollectionReset += Nodes_CollectionReset;
+    }
+    protected virtual void Nodes_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<INode> e) {
+      foreach (var n in e.Items)
+        n.Parent = this;
+    }
+    protected virtual void Nodes_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<INode> e) {
+      foreach (var n in e.Items)
+        n.Parent = null;
+    }
+    protected virtual void Nodes_ItemsReplaced(object sender, Collections.CollectionItemsChangedEventArgs<INode> e) {
+      foreach (var n in e.OldItems)
+        n.Parent = null;
+      foreach (var n in e.Items)
+        n.Parent = this;
+    }
+    protected virtual void Nodes_CollectionReset(object sender, Collections.CollectionItemsChangedEventArgs<INode> e) {
+      foreach (var n in e.OldItems)
+        n.Parent = null;
+      foreach (var n in e.Items)
+        n.Parent = this;
+    }
+    #endregion
   }
 }

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

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace HeuristicLab.Optimization.Networks {
   [Item("Node", "A node of an optimization network.")]
   [StorableClass]
-  public class Node : NamedItem, INode {
+  public class Node : Entity, INode {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
+    }
+
+    new public INetwork Parent {
+      get { return (INetwork)base.Parent; }
+      set {
+        // NOTE: never call setter directly as the Parent property is set by the network which contains the node
+        base.Parent = value;
+      }
+    }
+    public override IEnumerable<IEntity> Children {
+      get { return base.Children.Concat(Ports.AsEnumerable<IEntity>()); }
     }
 

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

@@ -29 +29 @@
   [Item("Port", "Abstract base class for ports of an optimization network node.")]
   [StorableClass]
-  public abstract class Port : NamedItem, IPort {
+  public abstract class Port : Entity, IPort {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Field; }
     }
 
-    private INode parent;
-    public INode Parent {
-      get { return parent; }
+    new public INode Parent {
+      get { return (INode)base.Parent; }
       set {
         // NOTE: never call setter directly as the Parent property is set by the node which contains the port
-        if (value != parent) {
-          DeregisterParentEvents();
-          parent = value;
-          RegisterParentEvents();
-          OnPathChanged();
-        }
-      }
-    }
-    public string Path {
-      get {
-        return parent != null ? parent.Name : string.Empty;
+        base.Parent = value;
       }
     }
@@ -59 +48 @@
     protected Port(string name) : base(name) { }
     protected Port(string name, string description) : base(name, description) { }
-
-    public event EventHandler PathChanged;
-    protected virtual void OnPathChanged() {
-      var handler = PathChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    #region Parent Events
-    protected virtual void RegisterParentEvents() {
-      if (parent != null) {
-        parent.NameChanged += Parent_NameChanged;
-      }
-    }
-    protected virtual void DeregisterParentEvents() {
-      if (parent != null) {
-        parent.NameChanged -= Parent_NameChanged;
-      }
-    }
-    void Parent_NameChanged(object sender, EventArgs e) {
-      OnPathChanged();
-    }
-    #endregion
   }
 }