Changeset 10677 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

Timestamp:

03/28/14 16:23:40 (10 years ago)

Author:

bburlacu

Message:

#1772: Improved usage of GenealogyGraph and GenealogyGraphNode classes. Made some progress on building block tracing.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs (modified) (1 diff)

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

@@ -58 +58 @@
     }
     public ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> LayoutEngine { get; set; }
-    private Dictionary<IPrimitive, ISymbolicExpressionTreeNode> primitiveMap;
+    private readonly Dictionary<IPrimitive, ISymbolicExpressionTreeNode> primitiveMap;
 
     public SymbolicExpressionTreeTile(IChart chart)
       : base(chart) {
       primitiveMap = new Dictionary<IPrimitive, ISymbolicExpressionTreeNode>();
+
+      Group = new Group(chart);
     }
     public SymbolicExpressionTreeTile(IChart chart, ISymbolicExpressionTree tree)
       : this(chart) {
-      SymbolicExpressionTree = tree;
       PreferredNodeWidth = 80;
       PreferredNodeHeight = 40;
+      SymbolicExpressionTree = tree;
     }
     private void GeneratePrimitives(double preferredNodeWidth, double preferredNodeHeight) {
       Clear();
-      ISymbolicExpressionTreeNode root = Root;
-      if (root.Symbol is ProgramRootSymbol && root.SubtreeCount == 1) { root = root.GetSubtree(0); }
-      var visualNodes = LayoutEngine.CalculateLayout(root);
+      var actualRoot = Root;
+      if (Root.Symbol is ProgramRootSymbol && Root.SubtreeCount == 1) { actualRoot = Root.GetSubtree(0); }
+      var visualNodes = LayoutEngine.CalculateLayout(actualRoot);
 
       var font = new Font(FontFamily.GenericSansSerif, 10, GraphicsUnit.Pixel);