Changeset 11253 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymboldDataAnalysisGenealogyView.cs

Timestamp:

07/31/14 17:11:39 (10 years ago)

Author:

bburlacu

Message:

#1772: Ported the rest of the changes to the DirectedGraph and Vertex to the GenealogyGraph and GenealogyGraphNode. Adapted tracking operators, analyzers and views.

File:

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

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

@@ -74 +74 @@
       var visualNode = (VisualGenealogyGraphNode)sender;
       var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)visualNode.Data;
-      var tree = graphNode.Content;
+      var tree = graphNode.Data;
       symbolicExpressionTreeChart.Tree = tree;
 
@@ -80 +80 @@
         var fragment = (IFragment<ISymbolicExpressionTreeNode>)graphNode.InArcs.Last().Data;
         if (fragment != null) {
-          treeChart_HighlightSubtree(graphNode.Content.NodeAt(fragment.Index1));
+          treeChart_HighlightSubtree(graphNode.Data.NodeAt(fragment.Index1));
         }
       }
@@ -98 +98 @@
         // perform fragment tracing
         var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)genealogyGraphChart.SelectedGraphNode;
-        var subtreeIndex = graphNode.Content.IterateNodesPrefix().ToList().IndexOf(subtree);
+        var subtreeIndex = graphNode.Data.IterateNodesPrefix().ToList().IndexOf(subtree);
         var fragmentGraph = SymbolicDataAnalysisExpressionTracing.TraceSubtree(graphNode, subtreeIndex);
         if (fragmentGraph.Vertices.Any()) {
@@ -106 +106 @@
         // perform matching like it was done before
         // currently there is no possibility to specify the subtree matching criteria
-        var trees = Content.Vertices.Select(x => x.Content);
+        var trees = Content.Vertices.Select(x => x.Data);
         var matchingTrees = trees.Where(x => x.Root.ContainsSubtree(subtree, comparer));