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

Timestamp:

01/13/15 17:14:45 (10 years ago)

Author:

bburlacu

Message:

#1772: TraceCalculator: Added static TraceSubtree method, renamed private Trace method to TraceRecursive to avoid method name confusion.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/TraceCalculator.cs (modified) (6 diffs)

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

@@ -34 +34 @@
   [StorableClass]
   public class TraceCalculator : Item {
-    private readonly IGenealogyGraph<ISymbolicExpressionTree> traceGraph;
-    private readonly Dictionary<IGenealogyGraphNode<ISymbolicExpressionTree>, Tuple<int, int>> traceMap;
+    private IGenealogyGraph<ISymbolicExpressionTree> traceGraph;
+    private Dictionary<IGenealogyGraphNode<ISymbolicExpressionTree>, Tuple<int, int>> traceMap;
 
     public IGenealogyGraph<ISymbolicExpressionTree> TraceGraph { get { return traceGraph; } }
@@ -58 +58 @@
     }
 
+    public IGenealogyGraph<ISymbolicExpressionTree> PartialTrace(IGenealogyGraphNode<ISymbolicExpressionTree> node,
+      int subtreeIndex, ISymbolicExpressionTreeNode subtree) {
+      traceGraph = new GenealogyGraph<ISymbolicExpressionTree>();
+      traceMap = new Dictionary<IGenealogyGraphNode<ISymbolicExpressionTree>, Tuple<int, int>>();
+      return null;
+    }
+
     public IGenealogyGraph<ISymbolicExpressionTree> Trace(IGenealogyGraphNode<ISymbolicExpressionTree> node, int subtreeIndex) {
-      traceGraph.Clear();
-      traceMap.Clear();
-      Trace(node, subtreeIndex, null);
+      traceGraph = new GenealogyGraph<ISymbolicExpressionTree>();
+      traceMap = new Dictionary<IGenealogyGraphNode<ISymbolicExpressionTree>, Tuple<int, int>>();
+      TraceRecursive(node, subtreeIndex);
       return traceGraph;
     }
@@ -82 +89 @@
     /// - lastFi is the subtree index in the previous trace node
     /// </summary>
-    /// <param name="g">The current node in the genealogy graph</param>
-    /// <param name="si">The index of the traced subtree</param>
+    /// <param name="node">The current node in the genealogy graph</param>
+    /// <param name="subtreeIndex">The index of the traced subtree</param>
     /// <param name="last">The last added node in the trace graph</param>
-    private void Trace(IGenealogyGraphNode<ISymbolicExpressionTree> g, int si, IGenealogyGraphNode<ISymbolicExpressionTree> last = null) {
+    private void TraceRecursive(IGenealogyGraphNode<ISymbolicExpressionTree> node, int subtreeIndex, IGenealogyGraphNode<ISymbolicExpressionTree> last = null) {
+      var g = node;
+      int si = subtreeIndex;
       while (g.Parents.Any()) {
+        Debug.Assert(si < g.Data.Length);
         var parents = g.Parents.ToList();
         var fragment = (IFragment<ISymbolicExpressionTreeNode>)g.InArcs.Last().Data;
@@ -124 +134 @@
               // subtree contains fragment => branching point in the fragment graph
               var n = GetTraceNode(g, si, fi);
-              Trace(parents[0], si, n);
-              Trace(parents[1], fragment.Index2, n);
+              TraceRecursive(parents[0], si, n);
+              TraceRecursive(parents[1], fragment.Index2, n);
               break;
             } else {
@@ -144 +154 @@
             var n = GetTraceNode(g, si, fi);
             int i = si < fi ? si : fi;
-            Trace(parents[0], i, n);
+            TraceRecursive(parents[0], i, n);
             break;
           } else {
@@ -207 +217 @@
   internal static class Util {
     // shallow node copy (does not clone the data or the arcs)
+    #region some helper methods for shortening the tracing code
     public static IGenealogyGraphNode<ISymbolicExpressionTree> Copy(this IGenealogyGraphNode<ISymbolicExpressionTree> node) {
       return new GenealogyGraphNode<ISymbolicExpressionTree>(node.Data) { Rank = node.Rank, Quality = node.Quality };
     }
-    #region some helper methods for shortening the tracing code
     public static ISymbolicExpressionTreeNode NodeAt(this ISymbolicExpressionTree tree, int index) {
       return NodeAt(tree.Root, index);