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

Timestamp:

10/07/14 08:32:58 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3

Files:

• HeuristicLab.Optimization.Networks-3.3.csproj (modified) (3 diffs)
• IInputOutputPort.cs (modified) (2 diffs)
• IInputPort.cs (modified) (2 diffs)
• IOutputInputPort.cs (modified) (1 diff)
• IOutputPort.cs (modified) (1 diff)
• IPort.cs (modified) (1 diff)
• IValuePort.cs (added)
• InputOutputPort.cs (modified) (1 diff)
• InputPort.cs (modified) (1 diff)
• Node.cs (modified) (1 diff)
• OutputInputPort.cs (modified) (1 diff)
• OutputPort.cs (modified) (1 diff)
• Port.cs (modified) (2 diffs)
• PortCollection.cs (modified) (1 diff)
• ValuePort.cs (added)

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

@@ -48 +48 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IPort.cs" />
     <Compile Include="IVariablesNode.cs" />
+    <Compile Include="Port.cs" />
     <Compile Include="VariablesNode.cs" />
     <Compile Include="EventArgs.cs" />
@@ -61 +63 @@
     <Compile Include="INetwork.cs" />
     <Compile Include="IInputPort.cs" />
-    <Compile Include="IPort.cs" />
+    <Compile Include="IValuePort.cs" />
     <Compile Include="INode.cs" />
     <Compile Include="Network.cs" />
@@ -67 +69 @@
     <Compile Include="NodeCollection.cs" />
     <Compile Include="PortCollection.cs" />
-    <Compile Include="Port.cs" />
+    <Compile Include="ValuePort.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization.Networks {
-  public interface IInputOutputPort : IPort {
+  public interface IInputOutputPort : IValuePort {
     IOutputInputPort OutputInputPort { get; }
 
@@ -30 +30 @@
   }
 
-  public interface IInputOutputPort<TIn, TOut> : IInputOutputPort, IPort<TIn>
+  public interface IInputOutputPort<TIn, TOut> : IInputOutputPort, IValuePort<TIn>
     where TIn : class, IItem
     where TOut : class, IItem {

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

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization.Networks {
-  public interface IInputPort : IPort {
+  public interface IInputPort : IValuePort {
     IOutputPort OutputPort { get; set; }
 
@@ -30 +30 @@
   }
 
-  public interface IInputPort<T> : IInputPort, IPort<T> where T : class, IItem {
+  public interface IInputPort<T> : IInputPort, IValuePort<T> where T : class, IItem {
     new IOutputPort<T> OutputPort { get; set; }
   }

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

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization.Networks {
-  public interface IOutputInputPort : IPort {
+  public interface IOutputInputPort : IValuePort {
     object SendValue(object value);
   }
 
-  public interface IOutputInputPort<TOut, TIn> : IOutputInputPort, IPort<TOut>
+  public interface IOutputInputPort<TOut, TIn> : IOutputInputPort, IValuePort<TOut>
     where TOut : class, IItem
     where TIn : class, IItem {

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

@@ -23 +23 @@
 
 namespace HeuristicLab.Optimization.Networks {
-  public interface IOutputPort : IPort {
+  public interface IOutputPort : IValuePort {
     new object Value { get; set; }
   }
 
-  public interface IOutputPort<T> : IOutputPort, IPort<T> where T : class, IItem {
+  public interface IOutputPort<T> : IOutputPort, IValuePort<T> where T : class, IItem {
     new T Value { get; set; }
   }

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

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using System;
 
 namespace HeuristicLab.Optimization.Networks {
   public interface IPort : INamedItem {
-    //DISCUSS: Should there be a reference to the node of this port?
-
-    object Value { get; }
-
-    event EventHandler ValueChanged;
-  }
-
-  public interface IPort<T> : IPort where T : class, IItem {
-    new T Value { get; }
+    INode Node { get; set; }
   }
 }

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

@@ -28 +28 @@
   [Item("InputOutputPort", "A synchronous input/output port of an optimization network node.")]
   [StorableClass]
-  public class InputOutputPort<TIn, TOut> : Port<TIn>, IInputOutputPort<TIn, TOut>
+  public class InputOutputPort<TIn, TOut> : ValuePort<TIn>, IInputOutputPort<TIn, TOut>
     where TIn : class, IItem
     where TOut : class, IItem {

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

@@ -29 +29 @@
   [Item("InputPort", "An asynchronous input port of an optimization network node.")]
   [StorableClass]
-  public class InputPort<T> : Port<T>, IInputPort<T> where T : class, IItem {
+  public class InputPort<T> : ValuePort<T>, IInputPort<T> where T : class, IItem {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.ArrowDown; }

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

@@ -56 +56 @@
     public Node()
       : base("Node") {
-      ports = new PortCollection();
+      ports = new PortCollection(this);
       readOnlyPorts = null;
     }
     public Node(string name)
       : base(name) {
-      ports = new PortCollection();
+      ports = new PortCollection(this);
       readOnlyPorts = null;
     }
     public Node(string name, string description)
       : base(name, description) {
-      ports = new PortCollection();
+      ports = new PortCollection(this);
       readOnlyPorts = null;
     }

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

@@ -28 +28 @@
   [Item("OutputInputPort", "A synchronous output/input port of an optimization network node.")]
   [StorableClass]
-  public class OutputInputPort<TOut, TIn> : Port<TOut>, IOutputInputPort<TOut, TIn>
+  public class OutputInputPort<TOut, TIn> : ValuePort<TOut>, IOutputInputPort<TOut, TIn>
     where TOut : class, IItem
     where TIn : class, IItem {

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

@@ -29 +29 @@
   [Item("OutputPort", "An asynchronous output port of an optimization network node.")]
   [StorableClass]
-  public class OutputPort<T> : Port<T>, IOutputPort<T> where T : class, IItem {
+  public class OutputPort<T> : ValuePort<T>, IOutputPort<T> where T : class, IItem {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.ArrowUp; }

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<T> : NamedItem, IPort<T> where T : class, IItem {
+  public abstract class Port : NamedItem, IPort {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Field; }
@@ -35 +35 @@
 
     [Storable]
-    protected T value;
-    public virtual T Value {
-      get { return value; }
-      protected set {
-        DeregisterValueEvents();
-        this.value = value;
-        RegisterValueEvents();
-        OnValueChanged();
+    private INode node;
+    public INode Node {
+      get { return node; }
+      set {
+        if ((value != null) && !value.Ports.Contains(this))
+          throw new InvalidOperationException("Port is not contained in port collection of node.");
+        if ((value == null) && node.Ports.Contains(this))
+          throw new InvalidOperationException("Port is still contained in port collection of node.");
+        node = value;
       }
-    }
-    object IPort.Value {
-      get { return Value; }
     }
 
     [StorableConstructor]
     protected Port(bool deserializing) : base(deserializing) { }
-    protected Port(Port<T> original, Cloner cloner)
+    protected Port(Port original, Cloner cloner)
       : base(original, cloner) {
-      value = cloner.Clone(original.value);
-      RegisterValueEvents();
+      node = (INode)cloner.GetClone(original.node);  // NOTE: original node is NOT automatically cloned
     }
     protected Port() : base("Port") { }
     protected Port(string name) : base(name) { }
     protected Port(string name, string description) : base(name, description) { }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterValueEvents();
-    }
-
-    public override string ToString() {
-      return Name + ": " + (Value != null ? Value.ToString() : "null");
-    }
-
-    public event EventHandler ValueChanged;
-    protected virtual void OnValueChanged() {
-      var handler = ValueChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-      OnToStringChanged();
-    }
-
-    protected virtual void RegisterValueEvents() {
-      if (value != null) {
-        value.ToStringChanged += new EventHandler(Value_ToStringChanged);
-      }
-    }
-    protected virtual void DeregisterValueEvents() {
-      if (value != null) {
-        value.ToStringChanged -= new EventHandler(Value_ToStringChanged);
-      }
-    }
-    private void Value_ToStringChanged(object sender, EventArgs e) {
-      OnToStringChanged();
-    }
   }
 }

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

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Optimization.Networks {
   [StorableClass]
-  [Item("PortCollection", "Represents a collection of ports.")]
+  [Item("PortCollection", "Represents a collection of ports in an optimization network node.")]
   public class PortCollection : NamedItemCollection<IPort> {
+    [Storable]
+    private INode node;
+    public INode Node {
+      get { return node; }
+    }
+
     [StorableConstructor]
     protected PortCollection(bool deserializing) : base(deserializing) { }
-    protected PortCollection(PortCollection original, Cloner cloner) : base(original, cloner) { }
-    public PortCollection() : base() { }
-    public PortCollection(int capacity) : base(capacity) { }
-    public PortCollection(IEnumerable<IPort> collection) : base(collection) { }
+    protected PortCollection(PortCollection original, Cloner cloner)
+      : base(original, cloner) {
+      if (!cloner.ClonedObjectRegistered(original.node))
+        // NOTE: cannot clone port collection alone if referenced node is not cloned
+        throw new InvalidOperationException("Node of port collection is not cloned.");
+      node = cloner.Clone(original.node);
+    }
+    public PortCollection(INode node)
+      : base() {
+      this.node = node;
+    }
+    public PortCollection(INode node, int capacity)
+      : base(capacity) {
+      this.node = node;
+    }
+    public PortCollection(INode node, IEnumerable<IPort> collection)
+      : base(collection) {
+      this.node = node;
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) { return new PortCollection(this, cloner); }
+
+    protected override void OnItemsAdded(IEnumerable<IPort> items) {
+      foreach (var p in items)
+        p.Node = node;
+      base.OnItemsAdded(items);
+    }
+    protected override void OnItemsRemoved(IEnumerable<IPort> items) {
+      foreach (var p in items)
+        p.Node = null;
+      base.OnItemsRemoved(items);
+    }
+    protected override void OnItemsReplaced(IEnumerable<IPort> items, IEnumerable<IPort> oldItems) {
+      foreach (var p in oldItems)
+        p.Node = null;
+      foreach (var p in items)
+        p.Node = node;
+      base.OnItemsReplaced(items, oldItems);
+    }
+    protected override void OnCollectionReset(IEnumerable<IPort> items, IEnumerable<IPort> oldItems) {
+      foreach (var p in oldItems)
+        p.Node = null;
+      foreach (var p in items)
+        p.Node = node;
+      base.OnCollectionReset(items, oldItems);
+    }
   }
 }