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

Timestamp:

04/16/14 17:15:33 (11 years ago)

Author:

bburlacu

Message:

#1772: Simplified genealogy graph and fragment graph creation:

• the genealogy graph now has a 1-1 mapping between content and vertices (as opposed to 1-n as it was previously, to account for elites); this required changes to the directed graph implementation
• the fragment graph only contains bifurcation points (where the subtree contains the fragment so tracing must be done both ways (in the root parent AND in the other parent). in the other cases, tracing is restarted from the parent genealogy graph node.

Location:

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

Files:

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

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

@@ -2 +2 @@
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -93 +94 @@
         var aPos = aTile.Position;
 
-        if (node.Content.Index > 0) {
-          var subtree = node.Content.Root.NodeAt(node.Content.Index);
-          foreach (var s in subtree.IterateNodesPrefix()) {
+        if (node.Rank.IsAlmost(0)) {
+          foreach (var s in node.Content.Root.IterateNodesPrefix()) {
             var primitive = aTile.GetPrimitive(s);
             if (primitive != null) {
               var rpb = primitive as RectangularPrimitiveBase;
               if (rpb != null) {
-                rpb.Pen = new Pen(Color.RoyalBlue);
+                rpb.Pen = new Pen(Color.ForestGreen);
+              }
+            }
+          }
+        } else {
+
+          if (node.Content.Index1 > 0) {
+            var subtree = node.Content.Root.NodeAt(node.Content.Index1);
+            foreach (var s in subtree.IterateNodesPrefix()) {
+              var primitive = aTile.GetPrimitive(s);
+              if (primitive != null) {
+                var rpb = primitive as RectangularPrimitiveBase;
+                if (rpb != null) {
+                  rpb.Pen = new Pen(Color.RoyalBlue);
+                }
               }
             }
@@ -115 +129 @@
 
           if (child == node.Children.First()) {
-            if (node.Content.Index > 0) {
-              var subtree = child.Content.Root.NodeAt(node.Content.Index);
+            if (node.Content.Index1 > 0) {
+              var subtree = child.Content.Root.NodeAt(node.Content.Index1);
               foreach (var s in subtree.IterateNodesPrefix()) {
                 var primitive = bTile.GetPrimitive(s);

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

@@ -81 +81 @@
         var fragment = (IFragment<ISymbolicExpressionTreeNode>)graphNode.InArcs.Last().Data;
         if (fragment != null) {
-          treeChart_HighlightSubtree(fragment.Root);
+          treeChart_HighlightSubtree(graphNode.Content.NodeAt(fragment.Index1));
         }
       }
@@ -101 +101 @@
         var subtreeIndex = graphNode.Content.IterateNodesPrefix().ToList().IndexOf(subtree);
         var fragmentGraph = SymbolicDataAnalysisExpressionTracing.TraceSubtree(graphNode, subtreeIndex);
-        MainFormManager.MainForm.ShowContent(fragmentGraph); // display the fragment graph on the screen
+        if (fragmentGraph.Nodes.Any()) {
+          MainFormManager.MainForm.ShowContent(fragmentGraph); // display the fragment graph on the screen
+        }
       } else {
         // perform matching like it was done before
@@ -108 +110 @@
         var matchingTrees = trees.Where(x => x.Root.ContainsSubtree(subtree, comparer));
 
-        var matchingVertices = matchingTrees.SelectMany(x => Content[x]).Cast<IGenealogyGraphNode<ISymbolicExpressionTree>>();
+        var matchingVertices = matchingTrees.Select(x => Content[x]).Cast<IGenealogyGraphNode<ISymbolicExpressionTree>>();
         graphChart_highlightMatchingVertices(matchingVertices);
       }