Changeset 10650 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs

Timestamp:

03/24/14 16:59:22 (10 years ago)

Author:

bburlacu

Message:

#1772: Added new SymbolicDataAnalysisGenealogyView and added support for the tracing of building blocks (finding the constituent ancestral elements of a selected subtree).

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs

@@ -41 +41 @@
 
     public ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> LayoutEngine { get; set; }
-    public SymbolicExpressionTreeTile(IChart chart) : base(chart) { }
+    private Dictionary<IPrimitive, ISymbolicExpressionTreeNode> primitiveMap;
+
+    public SymbolicExpressionTreeTile(IChart chart)
+      : base(chart) {
+      primitiveMap = new Dictionary<IPrimitive, ISymbolicExpressionTreeNode>();
+    }
     public SymbolicExpressionTreeTile(IChart chart, ISymbolicExpressionTree tree)
-      : base(chart) {
+      : this(chart) {
       SymbolicExpressionTree = tree;
       PreferredNodeWidth = 80;
@@ -50 +55 @@
     private void GeneratePrimitives(double preferredNodeWidth, double preferredNodeHeight) {
       Clear();
-      LayoutEngine.Initialize(SymbolicExpressionTree.Root, node => node.Subtrees);
-      LayoutEngine.CalculateLayout();
+      ISymbolicExpressionTreeNode root = SymbolicExpressionTree.Root;
+      if (root.Symbol is ProgramRootSymbol && root.SubtreeCount == 1) { root = root.GetSubtree(0); }
+      var visualNodes = LayoutEngine.CalculateLayout(root);
 
-      var primitivesMap = new Dictionary<ISymbolicExpressionTreeNode, IPrimitive>(); // both Ellipse and Rectangle are derived from the RectangularPrimitiveBase
       var font = new Font(FontFamily.GenericSansSerif, 10, GraphicsUnit.Pixel);
 
-      var visualNodes = LayoutEngine.GetVisualNodes().ToList();
       var visualNodeMap = visualNodes.ToDictionary(x => x.Content, x => x);
 
@@ -71 +75 @@
 
         this.Add(rectangularPrimitive);
-        primitivesMap.Add(node, rectangularPrimitive);
       }