Changeset 11750

Timestamp:

01/13/15 17:12:00 (10 years ago)

Author:

bburlacu

Message:

#1772: Changed Ancestors and Descendants methods to not include the current graph node as it better fits the definition of what an ancestor (or descendant) is.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphNode.cs (modified) (4 diffs)

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

@@ -59 +59 @@
     }
 
+    public IEnumerable<IGenealogyGraphNode> Parents {
+      get { return InArcs.Select(a => a.Source); }
+    }
+    public IEnumerable<IGenealogyGraphNode> Children {
+      get { return OutArcs.Select(a => a.Target); }
+    }
+
     public IEnumerable<IGenealogyGraphNode> Ancestors {
       get {
+        if (!Parents.Any())
+          return Enumerable.Empty<IGenealogyGraphNode>();
         // for performance, we use a hashset for lookup and a list for iteration
-        var nodes = new HashSet<IGenealogyGraphNode> { this };
-        var list = new List<IGenealogyGraphNode> { this };
+        var nodes = new HashSet<IGenealogyGraphNode>(Parents);
+        var list = new List<IGenealogyGraphNode>(Parents);
         int i = 0;
         while (i != list.Count) {
@@ -76 +85 @@
       }
     }
-    /// <summary>
-    /// Performs a downward-breath-traversal of the genealogy graph using the nodes OutArcs
-    /// </summary>
-    /// <returns>All the descendants of the current node</returns>
+
     public IEnumerable<IGenealogyGraphNode> Descendants {
       get {
-        var nodes = new HashSet<IGenealogyGraphNode> { this };
-        var list = new List<IGenealogyGraphNode> { this };
+        var nodes = new HashSet<IGenealogyGraphNode>(Children);
+        var list = new List<IGenealogyGraphNode>(Children);
         int i = 0;
         while (i != list.Count) {
@@ -96 +102 @@
       }
     }
+
     [Storable]
     public string Id { get; private set; }
@@ -119 +126 @@
     public int CompareTo(IGenealogyGraphNode other) {
       return Quality.CompareTo(other.Quality);
-    }
-    public IEnumerable<IGenealogyGraphNode> Parents {
-      get { return InArcs.Select(a => a.Source); }
-    }
-    public IEnumerable<IGenealogyGraphNode> Children {
-      get { return OutArcs.Select(a => a.Target); }
     }
   }