Changeset 10903 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph

Timestamp:

05/28/14 14:18:24 (10 years ago)

Author:

bburlacu

Message:

#1772: Removed Storable property from Vertex in- and outArcs as it causes a stack overflow exception during serialization. Added a list of arcs to the DirectedGraph class which is persisted. The Vertex in- and outArcs lists are then restored by the graph after the deserialization. Renamed Nodes data member to Vertices.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph

Files:

• GenealogyGraph.cs (modified) (4 diffs)
• GenealogyGraphArc.cs (modified) (1 diff)
• Interfaces/IGenealogyGraph.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

@@ -37 +37 @@
       set { ranks = value; }
     }
-    public new IEnumerable<IGenealogyGraphNode> Nodes {
-      get { return from n in base.Nodes select (IGenealogyGraphNode)n; }
+    public new IEnumerable<IGenealogyGraphNode> Vertices {
+      get { return from n in base.Vertices select (IGenealogyGraphNode)n; }
     }
 
@@ -58 +58 @@
       source.AddForwardArc(arc);
       target.AddReverseArc(arc);
+      arcs.Add(arc);
       return arc;
     }
@@ -97 +98 @@
       set { ranks = value; }
     }
-    public new IEnumerable<IGenealogyGraphNode<T>> Nodes {
-      get { return from n in base.Nodes select (IGenealogyGraphNode<T>)n; }
+    public new IEnumerable<IGenealogyGraphNode<T>> Vertices {
+      get { return from n in base.Vertices select (IGenealogyGraphNode<T>)n; }
     }
     // contructors
@@ -132 +133 @@
       source.AddForwardArc(arc);
       target.AddReverseArc(arc);
+      arcs.Add(arc);
       return arc;
     }
-    IEnumerable<IGenealogyGraphNode> IGenealogyGraph.Nodes {
-      get { return Nodes; }
+    IEnumerable<IGenealogyGraphNode> IGenealogyGraph.Vertices {
+      get { return Vertices; }
     }
     public event EventHandler GraphUpdated;

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphArc.cs

@@ -31 +31 @@
     protected GenealogyGraphArc(bool deserializing) : base(deserializing) { }
     protected GenealogyGraphArc(GenealogyGraphArc original, Cloner cloner)
-      : base(original, cloner) {
-      this.Target = original.Target;
-      this.Source = original.Source;
-      this.Label = original.Label;
-      this.Weight = original.Weight;
-      this.Data = original.Data;
-    }
+      : base(original, cloner) { }
 
     protected GenealogyGraphArc() { }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/Interfaces/IGenealogyGraph.cs

@@ -26 +26 @@
   public interface IGenealogyGraph : IDirectedGraph {
     Dictionary<double, List<IGenealogyGraphNode>> Ranks { get; }
-    new IEnumerable<IGenealogyGraphNode> Nodes { get; }
+    new IEnumerable<IGenealogyGraphNode> Vertices { get; }
   }
 
   public interface IGenealogyGraph<T> : IGenealogyGraph where T : class, IItem {
-    new IEnumerable<IGenealogyGraphNode<T>> Nodes { get; }
+    new IEnumerable<IGenealogyGraphNode<T>> Vertices { get; }
   }
 }