Changeset 14275 for branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/VariableInteractionNetwork.cs

Timestamp:

09/07/16 15:20:29 (8 years ago)

Author:

bburlacu

Message:

#2288: Clean up code and add comments in the ConstrainedForceDirectedLayout class. Minor changes to view and directed graph chart. Introduced an INetworkNode interface for more flexibility. Updated cola and adaptagrams dlls with latest changes from upstream.

File:

• branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/VariableInteractionNetwork.cs (modified) (2 diffs)

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/VariableInteractionNetwork.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -39 +40 @@
   [Item("VariableNetworkNode", "A graph vertex which represents a symbolic regression variable.")]
   [StorableClass]
-  public class VariableNetworkNode : Vertex<IDeepCloneable> {
-    public VariableNetworkNode() { }
+  public class VariableNetworkNode : Vertex<IDeepCloneable>, INetworkNode {
+    public VariableNetworkNode() {
+      Id = Guid.NewGuid().ToString();
+    }
 
-    public VariableNetworkNode(VariableNetworkNode original, Cloner cloner) : base(original, cloner) { }
+    public VariableNetworkNode(VariableNetworkNode original, Cloner cloner) : base(original, cloner) {
+      Id = original.Id;
+      Description = original.Description;
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new VariableNetworkNode(this, cloner);
     }
+
+    public string Id { get; }
+    public string Description { get; set; }
   }
 
   [Item("FunctionNetworkNode", "A graph vertex representing a junction node.")]
   [StorableClass]
-  public class JunctionNetworkNode : Vertex<IDeepCloneable> {
-    public JunctionNetworkNode() { }
+  public class JunctionNetworkNode : Vertex<IDeepCloneable>, INetworkNode {
+    public JunctionNetworkNode() {
+      Id = Guid.NewGuid().ToString();
+    }
 
-    public JunctionNetworkNode(JunctionNetworkNode original, Cloner cloner) : base(original, cloner) { }
+    public JunctionNetworkNode(JunctionNetworkNode original, Cloner cloner) : base(original, cloner) {
+      Id = original.Id;
+      Description = original.Description;
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new JunctionNetworkNode(this, cloner);
     }
+
+    public string Id { get; }
+    public string Description { get; set; }
   }
 }