Changeset 11015 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking

Timestamp:

06/13/14 17:20:36 (11 years ago)

Author:

bburlacu

Message:

#1772: Added partially working implementation of a bottom-up distance calculator for symbolic expression trees. Changed latex formatter to also return a map of node ids (useful when wanting to display trees side by side).

Location:

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

Files:

• FragmentGraphView.cs (modified) (3 diffs)
• SymboldDataAnalysisGenealogyView.cs (modified) (1 diff)

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

@@ -69 +69 @@
       var chart = symbolicExpressionChartControl.Chart;
       tileDictionary.Clear();
-      foreach (var node in Content.Nodes) {
+      foreach (var node in Content.Vertices) {
         var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)node.Content;
         var tile = new SymbolicExpressionTreeTile(chart);
@@ -79 +79 @@
         tileDictionary.Add(node, tileNode);
       }
-      foreach (var node in Content.Nodes.Where(n => n.OutArcs.Any())) {
+      foreach (var node in Content.Vertices.Where(n => n.OutArcs.Any())) {
         var layoutNode = tileDictionary[node];
         layoutNode.Children = new List<TileLayoutNode>(node.OutArcs.Select(a => tileDictionary[(FragmentNode)a.Target]));
@@ -87 +87 @@
     private void Draw() {
       var chart = symbolicExpressionChartControl.Chart;
-      var nodes = Content.Nodes.ToList();
+      var nodes = Content.Vertices.ToList();
       var root = nodes[0];
       var fragmentRoot = tileDictionary[root];

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

@@ -100 +100 @@
         var subtreeIndex = graphNode.Content.IterateNodesPrefix().ToList().IndexOf(subtree);
         var fragmentGraph = SymbolicDataAnalysisExpressionTracing.TraceSubtree(graphNode, subtreeIndex);
-        if (fragmentGraph.Nodes.Any()) {
+        if (fragmentGraph.Vertices.Any()) {
           MainFormManager.MainForm.ShowContent(fragmentGraph); // display the fragment graph on the screen
         }