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

Timestamp:

02/04/15 00:43:44 (10 years ago)

Author:

bburlacu

Message:

#1772:

• TraceGraph: Improved saving of trace data, changed GetTraceNode method to AddTraceNode and made the code more clear.
• SymbolicDataAnalysisGenealogyGraphView: added highlighting of trace information (when visualizing trace graphs)
• GenealogyGraphChart: removed useless code

File:

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

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

@@ -58 +58 @@
       tc.Trace(node, subtreeIndex);
       return tc.TraceGraph;
-    }
-
-    public IGenealogyGraph<ISymbolicExpressionTree> PartialTrace(IGenealogyGraphNode<ISymbolicExpressionTree> node,
-      int subtreeIndex, ISymbolicExpressionTreeNode subtree) {
-      traceGraph = new GenealogyGraph<ISymbolicExpressionTree>();
-      traceMap = new Dictionary<IGenealogyGraphNode<ISymbolicExpressionTree>, TraceData>();
-      return null;
     }
 
@@ -97 +90 @@
     private void TraceRecursive(IGenealogyGraphNode<ISymbolicExpressionTree> node, int subtreeIndex, IGenealogyGraphNode<ISymbolicExpressionTree> last = null) {
       var g = node;
-      int si = subtreeIndex;
+      int si = subtreeIndex; // subtree index
+      int fi = 0; // fragment index
       while (g.Parents.Any()) {
         Debug.Assert(si < g.Data.Length);
@@ -109 +103 @@
         }
 
-        int fi = fragment.Index1;               // fragment index
+        fi = fragment.Index1;               // fragment index
         int fl = fragment.Root.GetLength();     // fragment length
         int sl = NodeAt(g.Data, si).GetLength(); // subtree length
@@ -137 +131 @@
             if (fi < si + sl) {
               // subtree contains fragment => branching point in the fragment graph
-              var n = GetTraceNode(g, si, fi); // current node becomes "last" as we restart tracing from the parent
+              var n = AddTraceNode(g, si, fi); // current node becomes "last" as we restart tracing from the parent
               TraceRecursive(parent0, si, n);
               TraceRecursive(parent1, fragment.Index2, n);
@@ -157 +151 @@
           // check if the subtree and the fragment overlap => branch out
           if ((si == fi) || (si < fi && fi < si + sl) || (fi < si && si < fi + fl)) {
-            var n = GetTraceNode(g, si, fi); // current node becomes "last" as we restart tracing from the parent
+            var n = AddTraceNode(g, si, fi); // current node becomes "last" as we restart tracing from the parent
             int i = si < fi ? si : fi;
             TraceRecursive(parent0, i, n);
@@ -173 +167 @@
       }
       // when we are out of the while the last vertex must be connected with the current one
-      ConnectLast(g, si, last);
+      // if there is no last vertex, it means the tracing reached the top of the genealogy graph
+      var current = AddTraceNode(g, si, fi);
+      if (last != null)
+        ConnectLast(current, last, si, fi);
     }
 
@@ -184 +181 @@
     /// <param name="fi">The fragment index</param>
     /// <returns></returns>
-    private IGenealogyGraphNode<ISymbolicExpressionTree> GetTraceNode(IGenealogyGraphNode<ISymbolicExpressionTree> g, int si, int fi) {
+    private IGenealogyGraphNode<ISymbolicExpressionTree> AddTraceNode(IGenealogyGraphNode<ISymbolicExpressionTree> g, int si, int fi) {
       var n = traceGraph.GetByContent(g.Data);
       if (n == null) {
@@ -211 +208 @@
     /// of the genealogy graph node @g.  
     /// </summary>
-    /// <param name="g">The current node in the genealogy graph</param>
+    /// <param name="current">The current node in the genealogy graph</param>
+    /// <param name="last">The last added node in the trace graph</param>   
     /// <param name="si">The index of the traced subtree</param>
-    /// <param name="last">The last added node in the trace graph</param>
-    private void ConnectLast(IGenealogyGraphNode<ISymbolicExpressionTree> g, int si, IGenealogyGraphNode<ISymbolicExpressionTree> last) {
-      var inArcs = (List<IArc>)((IVertex)g).InArcs;
-      var fragment = g.Parents.Any() ? (IFragment<ISymbolicExpressionTreeNode>)inArcs.Last().Data : null;
-      int fi = fragment == null ? 0 : fragment.Index1; // fragment index
-      var n = GetTraceNode(g, si, fi); // will append n to the trace graph if it does not exist
-      if (last == null)
-        return;
+    /// <param name="fi">The index of the fragment</param>
+    private void ConnectLast(IGenealogyGraphNode<ISymbolicExpressionTree> current, IGenealogyGraphNode<ISymbolicExpressionTree> last, int si, int fi) {
       var lastTraceData = traceMap[last];
       int lastSi = lastTraceData.SubtreeIndex; // last subtree index (index of the traced subtree in the previous trace node)
       int lastFi = lastTraceData.FragmentIndex; // last fragment index (index of the fragment in the previous trace node)
       var td = new TraceData(si, fi, lastSi, lastFi); // trace data
-      var arc = n.OutArcs.SingleOrDefault(a => a.Target == last && a.Data.Equals(td));
+      var arc = current.OutArcs.SingleOrDefault(a => a.Target == last && a.Data.Equals(td));
       if (arc == null) {
-        arc = new GenealogyGraphArc(n, last) { Data = td };
+        arc = new GenealogyGraphArc(current, last) { Data = td };
         traceGraph.AddArc(arc);
       }
@@ -233 +225 @@
   }
   // this class is here to help clarify the semantics
-  internal class TraceData : Tuple<int, int, int, int> {
+  public class TraceData : Tuple<int, int, int, int> {
     public TraceData(int currentSubtreeIndex, int currentFragmentIndex, int lastSubtreeIndex, int lastFragmentIndex)
       : base(currentSubtreeIndex, currentFragmentIndex, lastSubtreeIndex, lastFragmentIndex) {