Changeset 8234

Timestamp:

07/05/12 15:21:07 (12 years ago)

Author:

ascheibe

Message:

#1886 updated graph from evolutionary tracking branch

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior/3.3

Files:

• Analyzers/BestIndividualQualityAnalyzer.cs (modified) (1 diff)
• GenealogyGraph.cs (modified) (3 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior/3.3/Analyzers/BestIndividualQualityAnalyzer.cs

@@ -119 +119 @@
         stringMatrix[i, 1] = element.Value;
       }
-      stringMatrix.ColumnNames = new[] { "Schema", "Occurence in hierarchy" };
+      stringMatrix.ColumnNames = new[] { "Schema", "Occurences in hierarchy" };
 
       Results.Add(new Result(SchemaQualityMatrixParameterName, stringMatrix));

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior/3.3/GenealogyGraph.cs

@@ -54 +54 @@
     }
 
-    private GenealogyGraph(GenealogyGraph<T> original, Cloner cloner)
+    protected GenealogyGraph(GenealogyGraph<T> original, Cloner cloner)
       : base(original, cloner) {
       _nodes = new Dictionary<T, GenealogyGraphNode>(original._nodes);
@@ -207 +207 @@
     /// <returns>All the ancestors of the current node</returns>
     public IEnumerable<GenealogyGraphNode> Ancestors() {
+      // for performance, we use a hashset for lookup and a list for iteration
       var nodes = new HashSet<GenealogyGraphNode> { this };
+      var list = new List<GenealogyGraphNode> { this };
       int i = 0;
-      while (i != nodes.Count) {
-        if (nodes.ElementAt(i).InEdges != null) {
-          foreach (var p in nodes.ElementAt(i).InEdges.Select(e => e.Target)) {
-            nodes.Add(p);
-            yield return p;
+      while (i != list.Count) {
+        if (list[i].InEdges != null) {
+          foreach (var e in list[i].InEdges) {
+            if (nodes.Contains(e.Target)) continue;
+            nodes.Add(e.Target);
+            list.Add(e.Target);
           }
         }
         ++i;
       }
+      return list;
     }
 
@@ -226 +230 @@
     public IEnumerable<GenealogyGraphNode> Descendants() {
       var nodes = new HashSet<GenealogyGraphNode> { this };
+      var list = new List<GenealogyGraphNode> { this };
       int i = 0;
-      while (i != nodes.Count) {
-        if (nodes.ElementAt(i).OutEdges != null) {
-          foreach (var p in nodes.ElementAt(i).OutEdges.Select(e => e.Target)) {
-            nodes.Add(p);
-            yield return p;
+      while (i != list.Count) {
+        if (list[i].OutEdges != null) {
+          foreach (var e in list[i].OutEdges) {
+            if (nodes.Contains(e.Target)) continue;
+            nodes.Add(e.Target);
+            list.Add(e.Target);
           }
         }
         ++i;
       }
+      return list;
     }