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

Timestamp:

10/03/14 02:20:19 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3

Files:

• AlgorithmNode.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks-3.3.csproj (modified) (1 diff)
• IInputOutputPort.cs (modified) (1 diff)
• IInputPort.cs (modified) (1 diff)
• IVariablesNode.cs (added)
• InputOutputPort.cs (modified) (1 diff)
• InputPort.cs (modified) (2 diffs)
• VariablesNode.cs (added)

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

@@ -83 +83 @@
         if (algorithm.Parameters.TryGetValue(port.Name, out param)) {
           IValueParameter p = param as IValueParameter;
-          if (p != null) {
+          if ((p != null) && (port.Value != null)) {
             p.Value = (IItem)port.Value;
           }

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

@@ -48 +48 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IVariablesNode.cs" />
+    <Compile Include="VariablesNode.cs" />
     <Compile Include="EventArgs.cs" />
     <Compile Include="IInputOutputPort.cs" />

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

@@ -26 +26 @@
   public interface IInputOutputPort : IPort {
     IOutputInputPort OutputInputPort { get; }
+
+    event EventHandler OutputInputPortChanged;
   }
 

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core;
 using System;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Optimization.Networks {
   public interface IInputPort : IPort {
-    IOutputPort OutputPort { get; }
+    IOutputPort OutputPort { get; set; }
+
+    event EventHandler OutputPortChanged;
   }
 

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

@@ -82 +82 @@
 
     protected void RegisterOutputInputPortEvents() {
-      outputInputPort.ValueSent += OutputInputPort_ValueSent;
+      if (outputInputPort != null) {
+        outputInputPort.ValueSent += OutputInputPort_ValueSent;
+      }
     }
     protected void DeregisterOutputInputPortEvents() {
-      outputInputPort.ValueSent -= OutputInputPort_ValueSent;
+      if (outputInputPort != null) {
+        outputInputPort.ValueSent -= OutputInputPort_ValueSent;
+      }
     }
     protected void OutputInputPort_ValueSent(object sender, OutputInputPortEventArgs<TIn, TOut> e) {

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

@@ -49 +49 @@
     IOutputPort IInputPort.OutputPort {
       get { return outputPort; }
+      set {
+        var val = value as IOutputPort<T>;
+        if ((value != null) && (val == null))
+          throw new InvalidOperationException(
+            string.Format("Type mismatch. OutputPort is not a \"{0}\".",
+                          typeof(IOutputPort<T>).GetPrettyName())
+          );
+        OutputPort = val;
+      }
     }
 
@@ -77 +86 @@
 
     protected void RegisterOutputPortEvents() {
-      outputPort.ValueChanged += OutputPort_ValueChanged;
-      
+      if (outputPort != null) {
+        outputPort.ValueChanged += OutputPort_ValueChanged;
+      }
     }
     protected void DeregisterOutputPortEvents() {
-      outputPort.ValueChanged -= OutputPort_ValueChanged;
+      if (outputPort != null) {
+        outputPort.ValueChanged -= OutputPort_ValueChanged;
+      }
     }
     protected void OutputPort_ValueChanged(object sender, EventArgs e) {