Changeset 13135 for branches/OptimizationNetworks/HeuristicLab.Networks

Timestamp:

11/11/15 13:53:10 (9 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• refactored network visualization

Location:

branches/OptimizationNetworks/HeuristicLab.Networks/3.3

Files:

• Core/INetworkItem.cs (modified) (1 diff)
• Core/INodeVisualProperties.cs (deleted)
• Core/IPortVisualProperties.cs (deleted)
• Core/IVisualProperties.cs (modified) (1 diff)
• Core/IVisualizable.cs (added)
• Core/IVisualizableNode.cs (deleted)
• Core/IVisualizablePort.cs (deleted)
• Core/NetworkItem.cs (modified) (1 diff)
• Core/Node.cs (modified) (2 diffs)
• Core/NodeVisualProperties.cs (deleted)
• Core/Port.cs (modified) (2 diffs)
• Core/PortVisualProperties.cs (deleted)
• Core/VisualProperties.cs (modified) (2 diffs)
• HeuristicLab.Networks-3.3.csproj (modified) (1 diff)
• Programmable/ProgrammableNetworkItem.cs (modified) (3 diffs)
• Programmable/ProgrammableNode.cs (modified) (3 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/INetworkItem.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Core.Networks {
-  public interface INetworkItem : INamedItem {
+  public interface INetworkItem : INamedItem, IVisualizable {
     INetworkItem Parent { get; }
     IEnumerable<INetworkItem> Children { get; }

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/IVisualProperties.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Core.Networks {
-  public interface IVisualProperties {
+  public interface IVisualProperties : IDeepCloneable {
     event EventHandler Changed;
   }

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/NetworkItem.cs

@@ -47 +47 @@
     }
 
+    [Storable]
+    public IVisualProperties VisualProperties { get; set; }
+
     [StorableConstructor]
     protected NetworkItem(bool deserializing) : base(deserializing) { }
-    protected NetworkItem(NetworkItem original, Cloner cloner) : base(original, cloner) { }
+    protected NetworkItem(NetworkItem original, Cloner cloner) : base(original, cloner) {
+      VisualProperties = cloner.Clone(original.VisualProperties);
+    }
     protected NetworkItem() : base("NetworkItem") { }
     protected NetworkItem(string name) : base(name) { }

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

@@ -29 +29 @@
   [Item("Node", "Abstract base class for nodes of a network.")]
   [StorableClass]
-  public abstract class Node : NetworkItem, IVisualizableNode {
+  public abstract class Node : NetworkItem, INode {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
@@ -55 +55 @@
         if (readOnlyPorts == null) readOnlyPorts = ports.AsReadOnly();
         return readOnlyPorts;
-      }
-    }
-
-    public string VisualName { get { return Name; } }
-
-    [Storable]
-    private INodeVisualProperties visualProperties;
-    public INodeVisualProperties VisualProperties {
-      get {
-        if (visualProperties == null)
-          visualProperties = new NodeVisualProperties();
-        return visualProperties;
       }
     }

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

@@ -27 +27 @@
   [Item("Port", "Abstract base class for ports of network nodes.")]
   [StorableClass]
-  public abstract class Port : NetworkItem, IVisualizablePort {
+  public abstract class Port : NetworkItem, IPort {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Interface; }
@@ -40 +40 @@
     }
 
-    [Storable]
-    private IPortVisualProperties visualProperties;
-    public IPortVisualProperties VisualProperties {
-      get {
-        if (visualProperties == null)
-          visualProperties = new PortVisualProperties();
-        return visualProperties;
-      }
-    }
-
     [StorableConstructor]
     protected Port(bool deserializing) : base(deserializing) { }

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/VisualProperties.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -5 +26 @@
 namespace HeuristicLab.Core.Networks {
   [StorableClass]
-  public class VisualProperties : DeepCloneable, IVisualProperties {
+  public abstract class VisualProperties : DeepCloneable, IVisualProperties {
     #region Constructors & Cloning
     [StorableConstructor]
     protected VisualProperties(bool deserializing) : base() { }
-    protected VisualProperties(VisualProperties original, Cloner cloner)
-      : base(original, cloner) { }
+    protected VisualProperties(VisualProperties original, Cloner cloner) : base(original, cloner) { }
 
-    public VisualProperties() { }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new VisualProperties(this, cloner);
-    }
+    protected VisualProperties() { }
     #endregion
 

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

@@ -203 +203 @@
     </Compile>
     <Compile Include="ConfigurationPort.cs" />
-    <Compile Include="Core\INodeVisualProperties.cs" />
-    <Compile Include="Core\IPortVisualProperties.cs" />
-    <Compile Include="Core\IVisualizableNode.cs" />
-    <Compile Include="Core\IVisualizablePort.cs" />
+    <Compile Include="Core\IVisualizable.cs" />
     <Compile Include="Core\IVisualProperties.cs" />
-    <Compile Include="Core\NodeVisualProperties.cs" />
-    <Compile Include="Core\PortVisualProperties.cs" />
     <Compile Include="Core\VisualProperties.cs" />
     <Compile Include="ExecutionPort.cs" />

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkItem.cs

@@ -98 +98 @@
       get { return CompiledNetworkItem.Children; }
     }
+
+    [Storable]
+    public IVisualProperties VisualProperties { get; set; }
     #endregion
 
@@ -169 +172 @@
       variableStore = cloner.Clone(original.variableStore);
       CompiledNetworkItem = cloner.Clone(original.compiledNetworkItem);
+      VisualProperties = cloner.Clone(original.VisualProperties);
     }
     protected ProgrammableNetworkItem()
@@ -358 +362 @@
         get { return Enumerable.Empty<INetworkItem>(); }
       }
+
+      // TODO: no visual properties needed here
+      public IVisualProperties VisualProperties {
+        get { return Context.VisualProperties; }
+        set { Context.VisualProperties = value; }
+      }
       #endregion
 

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNode.cs

@@ -32 +32 @@
   [Item("ProgrammableNode", "Abstract base class for programmable nodes of a network.")]
   [StorableClass]
-  public abstract class ProgrammableNode : ProgrammableNetworkItem, IProgrammableNode, IVisualizableNode {
+  public abstract class ProgrammableNode : ProgrammableNetworkItem, IProgrammableNode {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
@@ -58 +58 @@
       }
     }
-
-    public string VisualName { get { return Name; } }
-
-    [Storable]
-    private INodeVisualProperties visualProperties;
-    public INodeVisualProperties VisualProperties {
-      get {
-        if (visualProperties == null)
-          visualProperties = new NodeVisualProperties();
-        return visualProperties;
-      }
-    }
     #endregion
 
@@ -127 +115 @@
       IKeyedItemCollection<string, IPort> INode.Ports {
         get { return Ports; }
-      }
-
-      public string VisualName { get { return Context.VisualName; } }
-
-      public INodeVisualProperties VisualProperties {
-        get { return Context.VisualProperties; }
       }
       #endregion