Changeset 11120 for stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/Formatters

Timestamp:

07/07/14 16:55:50 (10 years ago)

Author:

gkronber

Message:

#2076,#2159, #2092
multi-ticket merge to stable:

• merged r10496,r10519,r10520,r10521,r10531,r10561,r10564,r10565,r10799,r10800,r10862,r10885,r11065 (#2076)
• merged r10499 (#2092)
• merged r10522,r10523,r10953,r10956 (#2159)

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/Formatters (copied) (copied from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/Formatters)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/Formatters/SymbolicExpressionTreeLatexFormatter.cs (modified) (3 diffs)

stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/Formatters/SymbolicExpressionTreeLatexFormatter.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Globalization;
 using System.Linq;
@@ -36 +37 @@
       {"StartSymbol","RPB"}
     };
-    private readonly ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>();
+
+    private readonly ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> layoutEngine;
 
     public SymbolicExpressionTreeLatexFormatter()
       : base("LaTeX/PDF Formatter", "Formatter for symbolic expression trees for use with latex package tikz.") {
-      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> {
+      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>(n => n.Subtrees) {
         HorizontalSpacing = 2,
         VerticalSpacing = 2,
@@ -57 +59 @@
 
     public string Format(ISymbolicExpressionTree symbolicExpressionTree) {
-      layoutEngine.Reset();
       var root = symbolicExpressionTree.Root;
       var actualRoot = root.SubtreeCount == 0 ? root.GetSubtree(0) : root;
-      layoutEngine.Initialize(actualRoot, x => x.Subtrees);
-      layoutEngine.CalculateLayout();
-      var nodeCoordinates = layoutEngine.GetCoordinates();
+      var nodeCoordinates = layoutEngine.CalculateLayout(actualRoot).ToDictionary(n => n.Content, n => new PointF(n.X, n.Y));
       var sb = new StringBuilder();
       var nl = Environment.NewLine;