Changeset 10725 for branches

Timestamp:

04/05/14 00:40:35 (11 years ago)

Author:

bburlacu

Message:

#1772: The subtree index needs to be adjusted if it is greater than the fragment index and the fragment is different in size than the subtree it replaced.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymboldDataAnalysisGenealogyView.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymboldDataAnalysisGenealogyView.cs

@@ -168 +168 @@
     }
 
-    private void Trace(IGenealogyGraphNode<ISymbolicExpressionTree> graphNode, ISymbolicExpressionTreeNode subtree, FragmentGraph fragmentGraph, FragmentNode parentNode = null) {
+    private static void Trace(IGenealogyGraphNode<ISymbolicExpressionTree> graphNode, ISymbolicExpressionTreeNode subtree, FragmentGraph fragmentGraph, FragmentNode parentNode = null) {
       while (true) {
         if (!graphNode.InArcs.Any()) return;
@@ -228 +228 @@
           }
         } else {
-          // fragment and subtree are completely distinct => we only track the subtree
+          // fragment and subtree are completely distinct => we only track the subtree (contained by the root parent)
+          // if the subtree comes AFTER the fragment in the prefix iteration of nodes, 
+          // then its index is affected by the difference in fragment size between current tree and parent
           graphNode = parentVertices[0];
           tree = graphNode.Content;
+          if (subtreeIndex > fragment.Index) {
+            var diff = tree.NodeAt(fragment.Index).GetLength() - fragmentLength;
+            subtreeIndex += diff;
+          }
           subtree = tree.NodeAt(subtreeIndex);
           continue;