Changeset 10886 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

05/22/14 13:49:35 (10 years ago)

Author:

bburlacu

Message:

#1772: Simplified GenealogyGraph (and related components) API in an effort to improve speed and memory consumption (eg., by sharing the same arc when walking the graph in both directions: parent-child and child-parent).

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• SymbolGraph/FPGraph.cs (modified) (1 diff)
• SymbolGraph/SymbolGraph.cs (modified) (1 diff)
• Tracking/SymbolicDataAnalysisExpressionTracing.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolGraph/FPGraph.cs

@@ -56 +56 @@
       return node;
     }
-
-    void AddArc(SymbolNode source, SymbolNode target, double weight, object data = null) {
-      source.AddForwardArc(target, weight, data);
-    }
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolGraph/SymbolGraph.cs

@@ -49 +49 @@
       return node;
     }
-
-    void AddArc(SymbolNode source, SymbolNode target, double weight, object data = null) {
-      source.AddForwardArc(target, weight, data);
-    }
   }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionTracing.cs

@@ -58 +58 @@
           };
           if (parent != null) {
-            var arc = new GenealogyGraphArc { Source = parent, Target = fragmentNode };
+            var arc = new GenealogyGraphArc(parent, fragmentNode);
             parent.AddForwardArc(arc);
-            fragmentNode.AddReverseArc(parent);
+            fragmentNode.AddReverseArc(arc);
           }
           yield return fragmentNode; // no tracing if there are no parents
@@ -91 +91 @@
           };
           if (parent != null) {
-            var arc = new GenealogyGraphArc { Source = parent, Target = fragmentNode };
+            var arc = new GenealogyGraphArc(parent, fragmentNode);
             parent.AddForwardArc(arc);
-            fragmentNode.AddReverseArc(parent);
+            fragmentNode.AddReverseArc(arc);
           }
           yield return fragmentNode;
@@ -134 +134 @@
               };
               if (parent != null) {
-                var arc = new GenealogyGraphArc { Source = parent, Target = fragmentNode };
+                var arc = new GenealogyGraphArc(parent, fragmentNode);
                 parent.AddForwardArc(arc);
-                fragmentNode.AddReverseArc(parent);
+                fragmentNode.AddReverseArc(arc);
               }
               //              fragmentNode.Content.Index1 = fragment.Index1 - index;