Changeset 11412 for branches/OptimizationNetworks

Timestamp:

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

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Optimization.Networks.Views/3.3/AlgorithmNodeView.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/HeuristicLab.Optimization.Networks.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/InputPortView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/InputPortView.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/PortView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views/3.3/PortView.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/VariablesNodeView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/VariablesNodeView.cs (added)
• HeuristicLab.Optimization.Networks/3.3/AlgorithmNode.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/HeuristicLab.Optimization.Networks-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/IInputOutputPort.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/IInputPort.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/IVariablesNode.cs (added)
• HeuristicLab.Optimization.Networks/3.3/InputOutputPort.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/InputPort.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Networks/3.3/VariablesNode.cs (added)

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Optimization.Networks.Views {
-  [View("Algorithm Node View")]
+  [View("AlgorithmNode View")]
   [Content(typeof(AlgorithmNode), true)]
   [Content(typeof(IAlgorithmNode), false)]
@@ -73 +73 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      portCollectionView.Enabled = Content != null;
+      portCollectionView.Enabled = Content != null && !ReadOnly;
       setAlgorithmButton.Enabled = Content != null && !ReadOnly;
       clearAlgorithmButton.Enabled = Content != null && Content.Algorithm != null && !ReadOnly;
@@ -116 +116 @@
         else if (e.AllowedEffect.HasFlag(DragDropEffects.Link)) e.Effect = DragDropEffects.Link;
       }
-
     }
     protected virtual void algorithmPanel_DragDrop(object sender, DragEventArgs e) {

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

@@ -49 +49 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="VariablesNodeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="VariablesNodeView.Designer.cs">
+      <DependentUpon>VariablesNodeView.cs</DependentUpon>
+    </Compile>
     <Compile Include="AlgorithmNodeView.cs">
       <SubType>UserControl</SubType>
@@ -54 +60 @@
     <Compile Include="AlgorithmNodeView.Designer.cs">
       <DependentUpon>AlgorithmNodeView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="InputPortView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="InputPortView.Designer.cs">
+      <DependentUpon>InputPortView.cs</DependentUpon>
     </Compile>
     <Compile Include="PortView.cs">

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

@@ -21 +21 @@
 
 namespace HeuristicLab.Optimization.Networks.Views {
-  partial class PortView<T> {
+  partial class PortView {
     /// <summary> 
     /// Required designer variable.

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Core;
+using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -30 +30 @@
   [Content(typeof(Port<>), true)]
   [Content(typeof(IPort<>), false)]
-  public partial class PortView<T> : NamedItemView where T : class, IItem {
-    public new IPort<T> Content {
-      get { return (IPort<T>)base.Content; }
+  [Content(typeof(IPort), false)]
+  public partial class PortView : NamedItemView {
+    public new IPort Content {
+      get { return (IPort)base.Content; }
       set { base.Content = value; }
     }
@@ -56 +57 @@
       } else {
         valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value;
+        valueViewHost.Content = Content.Value as IContent;
       }
     }
@@ -62 +63 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      valueGroupBox.Enabled = Content != null;
+      valueGroupBox.Enabled = (Content as IContent) != null;
     }
     protected virtual void Content_ValueChanged(object sender, System.EventArgs e) {
@@ -69 +70 @@
       else {
         valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value;
+        valueViewHost.Content = Content.Value as IContent;
 
       }

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) {