Changeset 11409

Timestamp:

10/02/14 03:30:30 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Optimization.Networks.Views/3.3/AlgorithmNodeView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/AlgorithmNodeView.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/HeuristicLab.Optimization.Networks.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/NetworkView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/NetworkView.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/NodeCollectionView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/NodeCollectionView.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/NodeView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/NodeView.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views/3.3/PortCollectionView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/PortCollectionView.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/PortView.Designer.cs (added)
• HeuristicLab.Optimization.Networks.Views/3.3/PortView.cs (added)
• HeuristicLab.Optimization.Networks/3.3/AlgorithmNode.cs (modified) (11 diffs)
• HeuristicLab.Optimization.Networks/3.3/IAlgorithmNode.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/IPort.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/InputPort.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Networks/3.3/Network.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/OutputPort.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Networks/3.3/Plugin.cs.frame (modified) (1 diff)

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

@@ -40 +40 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -47 +49 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AlgorithmNodeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="AlgorithmNodeView.Designer.cs">
+      <DependentUpon>AlgorithmNodeView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="PortView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PortView.Designer.cs">
+      <DependentUpon>PortView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="NodeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="NodeView.Designer.cs">
+      <DependentUpon>NodeView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="PortCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PortCollectionView.Designer.cs">
+      <DependentUpon>PortCollectionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="NetworkView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="NetworkView.Designer.cs">
+      <DependentUpon>NetworkView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="NodeCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="NodeCollectionView.Designer.cs">
+      <DependentUpon>NodeCollectionView.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -56 +94 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
+      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
+      <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
+      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
+      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
+      <Name>HeuristicLab.Common-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
+      <Project>{e226881d-315f-423d-b419-a766fe0d8685}</Project>
+      <Name>HeuristicLab.Core.Views-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
+      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
+      <Name>HeuristicLab.Core-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
+      <Project>{ab687bbe-1bfe-476b-906d-44237135431d}</Project>
+      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
+      <Project>{3bd61258-31da-4b09-89c0-4f71fef5f05a}</Project>
+      <Name>HeuristicLab.MainForm-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Networks\3.3\HeuristicLab.Optimization.Networks-3.3.csproj">
+      <Project>{7cf51332-0e37-447c-8017-82a258c59ef2}</Project>
+      <Name>HeuristicLab.Optimization.Networks-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>

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

@@ -28 +28 @@
   [Plugin("HeuristicLab.Optimization.Networks.Views", "3.3.11.$WCREV$")]
   [PluginFile("HeuristicLab.Optimization.Networks.Views-3.3.dll", PluginFileType.Assembly)]
-//  [PluginDependency("HeuristicLab.Collections", "3.3")]
-//  [PluginDependency("HeuristicLab.Common", "3.3")]
-//  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
-//  [PluginDependency("HeuristicLab.Core", "3.3")]
-//  [PluginDependency("HeuristicLab.Data", "3.3")]
-//  [PluginDependency("HeuristicLab.Parameters", "3.3")]
-//  [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Networks", "3.3")]
   public class HeuristicLabOptimizationNetworksViewsPlugin : PluginBase {
   }

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System;
 
 namespace HeuristicLab.Optimization.Networks {
   [Item("AlgorithmNode", "A node of an optimization network which contains a HeuristicLab algorithm.")]
   [StorableClass]
-  public class AlgorithmNode : Node {
+  public class AlgorithmNode : Node, IAlgorithmNode {
+    new public PortCollection Ports {
+      get { return base.Ports; }
+    }
+
     [Storable]
     private IAlgorithm algorithm;
@@ -54 +56 @@
     }
     public AlgorithmNode()
-      : base("Node") {
+      : base("AlgorithmNode") {
       RegisterPortsEvents();
     }
@@ -69 +71 @@
     private void AfterDeserialization() {
       RegisterPortsEvents();
+      RegisterAlgorithmEvents();
     }
 
@@ -77 +80 @@
     private void UpdateParameter(IInputPort port) {
       if (algorithm != null) {
-        foreach (var param in algorithm.Parameters) {
+        IParameter param = null;
+        if (algorithm.Parameters.TryGetValue(port.Name, out param)) {
           IValueParameter p = param as IValueParameter;
-          if ((p != null) && (p.Name == port.Name)) {
+          if (p != null) {
             p.Value = (IItem)port.Value;
           }
@@ -86 +90 @@
     }
     private void UpdateOutputPort(IResult result) {
-      foreach (var port in Ports) {
+      IPort port = null;
+      if (Ports.TryGetValue(result.Name, out port)) {
         IOutputPort p = port as IOutputPort;
-        if ((p != null) && (p.Name == result.Name)) {
+        if (p != null) {
           p.Value = result.Value;
+        }
+      }
+    }
+    private void UpdateOutputPort(IOutputPort port) {
+      if ((algorithm != null) && (algorithm.Results != null)) {
+        IResult result = null;
+        if (algorithm.Results.TryGetValue(port.Name, out result)) {
+          port.Value = result != null ? result.Value : null;
+        } else {
+          port.Value = null;
         }
       }
@@ -106 +121 @@
       Ports.ItemsReplaced += Ports_ItemsReplaced;
       Ports.CollectionReset += Ports_CollectionReset;
+      foreach (var p in Ports)
+        RegisterPortEvents(p);
     }
     void Ports_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IPort> e) {
@@ -131 +148 @@
     #region Port Events
     private void RegisterPortEvents(IPort port) {
-      IInputPort p = port as IInputPort;
-      if (p != null) {
-        p.ValueChanged += InputPort_ValueChanged;
+      IInputPort i = port as IInputPort;
+      if (i != null) {
+        i.NameChanged += InputPort_NameChanged;
+        i.ValueChanged += InputPort_ValueChanged;
+        UpdateParameter(i);
+      }
+      IOutputPort o = port as IOutputPort;
+      if (o != null) {
+        o.NameChanged += OutputPort_NameChanged;
+        UpdateOutputPort(o);
       }
     }
     private void DeregisterPortEvents(IPort port) {
-      IInputPort p = port as IInputPort;
-      if (p != null) {
-        p.ValueChanged -= InputPort_ValueChanged;
-      }
+      IInputPort i = port as IInputPort;
+      if (i != null) {
+        i.NameChanged -= InputPort_NameChanged;
+        i.ValueChanged -= InputPort_ValueChanged;
+      }
+      IOutputPort o = port as IOutputPort;
+      if (o != null) {
+        o.NameChanged -= OutputPort_NameChanged;
+      }
+    }
+    private void InputPort_NameChanged(object sender, EventArgs e) {
+      UpdateParameter((IInputPort)sender);
     }
     private void InputPort_ValueChanged(object sender, EventArgs e) {
       UpdateParameter((IInputPort)sender);
+    }
+    private void OutputPort_NameChanged(object sender, EventArgs e) {
+      UpdateOutputPort((IOutputPort)sender);
     }
     #endregion
@@ -150 +185 @@
     private void RegisterAlgorithmEvents() {
       if (algorithm != null) {
+        algorithm.Prepared += Algorithm_Prepared;
+        RegisterResultsEvents();
+      }
+    }
+
+    private void DeregisterAlgorithmEvents() {
+      if (algorithm != null) {
+        algorithm.Prepared -= Algorithm_Prepared;
+        DeregisterResultsEvents();
+      }
+    }
+    private void Algorithm_Prepared(object sender, EventArgs e) {
+      RegisterResultsEvents();
+    }
+    #endregion
+
+    #region Results Events
+    private void RegisterResultsEvents() {
+      if ((algorithm != null) && (algorithm.Results != null)) {
         algorithm.Results.ItemsAdded += Results_ItemsAdded;
         algorithm.Results.ItemsRemoved += Results_ItemsRemoved;
         algorithm.Results.ItemsReplaced += Results_ItemsReplaced;
         algorithm.Results.CollectionReset += Results_CollectionReset;
-      }
-    }
-    private void DeregisterAlgorithmEvents() {
-      if (algorithm != null) {
+        foreach (var r in algorithm.Results)
+          RegisterResultEvents(r);
+      }
+    }
+    private void DeregisterResultsEvents() {
+      if ((algorithm != null) && (algorithm.Results != null)) {
         algorithm.Results.ItemsAdded -= Results_ItemsAdded;
         algorithm.Results.ItemsRemoved -= Results_ItemsRemoved;
         algorithm.Results.ItemsReplaced -= Results_ItemsReplaced;
         algorithm.Results.CollectionReset -= Results_CollectionReset;
+        foreach (var r in algorithm.Results)
+          DeregisterResultEvents(r);
       }
     }
@@ -190 +248 @@
       if (result != null) {
         result.ValueChanged += Result_ValueChanged;
+        result.ToStringChanged += Result_ToStringChanged;
+        UpdateOutputPort(result);
       }
     }
@@ -195 +255 @@
       if (result != null) {
         result.ValueChanged -= Result_ValueChanged;
+        result.ToStringChanged += Result_ToStringChanged;
       }
     }
@@ -200 +261 @@
       UpdateOutputPort((IResult)sender);
     }
+    private void Result_ToStringChanged(object sender, EventArgs e) {
+      UpdateOutputPort((IResult)sender);
+    }
     #endregion
   }

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

@@ -24 +24 @@
 namespace HeuristicLab.Optimization.Networks {
   public interface IAlgorithmNode : INode {
+    new PortCollection Ports { get; }
+
     IAlgorithm Algorithm { get; set; }
     event EventHandler AlgorithmChanged;

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

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

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

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System;
+using System.Drawing;
 
 namespace HeuristicLab.Optimization.Networks {
@@ -29 +30 @@
   [StorableClass]
   public class InputPort<T> : Port<T>, IInputPort<T> where T : class, IItem {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.ArrowDown; }
+    }
+
     [Storable]
     private IOutputPort<T> outputPort;

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

@@ -29 +29 @@
   [Creatable("Optimization Networks")]
   [StorableClass]
-  public class Network : Node, INetwork {
+  public class Network : Node, INetwork, IStorableContent {
+    public string Filename { get; set; }
+
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }

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

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System;
+using System.Drawing;
 
 namespace HeuristicLab.Optimization.Networks {
@@ -29 +30 @@
   [StorableClass]
   public class OutputPort<T> : Port<T>, IOutputPort<T> where T : class, IItem {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.ArrowUp; }
+    }
+
     new public T Value {
       get { return base.Value; }

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.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]