Changeset 10501 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters

Timestamp:

02/21/14 18:20:47 (11 years ago)

Author:

bburlacu

Message:

#1772: Merged trunk changes and added missing frame files (for HeuristicLab.EvolutionTracking and HeuristicLab.EvolutionTracking.Views.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Files:

• . (modified) (1 prop)
• 3.4/Formatters/SymbolicExpressionTreeHierarchicalFormatter.cs (added)
• 3.4/Formatters/SymbolicExpressionTreeLatexFormatter.cs (modified) (5 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeLatexFormatter.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -8 +29 @@
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
-  [Item("LaTeX/PDF Formatter", "Formatter for symbolic expression trees for use with latex.")]
+  [Item("LaTeX/PDF Formatter", "Formatter for symbolic expression trees for use with latex package tikz.")]
   public class SymbolicExpressionTreeLatexFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
-    private readonly static Dictionary<string, string> SymbolNamesMap = new Dictionary<string, string>
+    private readonly static Dictionary<string, string> symbolNameMap = new Dictionary<string, string>
     {
       {"ProgramRootSymbol", "Prog"},
-      {"StartSymbol","RPB"},
-      {"Addition", "$+$"},
-      {"Subtraction", "$-$"},
-      {"Multiplication", "$\\times$"},
-      {"Division", "$\\div$"},
-      {"Logarithm", "$\\log$"},
-      {"Exponential", "$\\exp$"}
+      {"StartSymbol","RPB"}
     };
-    private readonly ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> layoutEngine;
-    private readonly SymbolicExpressionTreeLayoutAdapter layoutAdapter;
+    private readonly ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>();
+    private readonly SymbolicExpressionTreeLayoutAdapter layoutAdapter = new SymbolicExpressionTreeLayoutAdapter();
 
-    public SymbolicExpressionTreeLatexFormatter() {
+    public SymbolicExpressionTreeLatexFormatter()
+      : base("LaTeX/PDF Formatter", "Formatter for symbolic expression trees for use with latex package tikz.") {
       layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>();
-      layoutAdapter = new SymbolicExpressionTreeLayoutAdapter();
     }
 
     protected SymbolicExpressionTreeLatexFormatter(SymbolicExpressionTreeLatexFormatter original, Cloner cloner)
       : base(original, cloner) {
-      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>();
-      layoutAdapter = new SymbolicExpressionTreeLayoutAdapter();
     }
 
@@ -40 +53 @@
 
     public string Format(ISymbolicExpressionTree symbolicExpressionTree) {
+      layoutEngine.Reset();
       var layoutNodes = layoutAdapter.Convert(symbolicExpressionTree).ToList();
-      layoutEngine.Reset();
       layoutEngine.Root = layoutNodes[0];
-      foreach (var ln in layoutNodes)
-        layoutEngine.AddNode(ln.Content, ln);
+      layoutEngine.AddNodes(layoutNodes);
       layoutEngine.CalculateLayout();
       var nodeCoordinates = layoutEngine.GetNodeCoordinates();
       var sb = new StringBuilder();
       var nl = Environment.NewLine;
+      double ws = 1;
+      double hs = 0.7;
+
       sb.Append("\\documentclass[class=minimal,border=0pt]{standalone}" + nl +
                 "\\usepackage{tikz}" + nl +
@@ -56 +71 @@
                 "\\def\\hs{0.7}" + nl);
 
-      const double ws = 1.0, hs = 0.7; // some scaling factors useful for fine-tuning document appearance before latex compilation
+      var nodeIndices = new Dictionary<ISymbolicExpressionTreeNode, int>();
       var nodes = symbolicExpressionTree.IterateNodesBreadth().ToList();
-      var nodeIndices = new Dictionary<ISymbolicExpressionTreeNode, int>();
       for (int i = 0; i < nodes.Count; ++i) {
         var node = nodes[i];
         nodeIndices.Add(node, i);
-        var symbolName = node.Symbol.Name;
-        var nodeName = SymbolNamesMap.ContainsKey(symbolName) ? SymbolNamesMap[symbolName] : symbolName;
         var coord = nodeCoordinates[node];
-
+        var nodeName = symbolNameMap.ContainsKey(node.Symbol.Name) ? symbolNameMap[node.Symbol.Name] : node.ToString();
         sb.AppendLine(string.Format(CultureInfo.InvariantCulture, "\\node ({0}) at (\\ws*{1},\\hs*{2}) {{{3}}};", i, ws * coord.X, -hs * coord.Y, EscapeLatexString(nodeName)));
       }
@@ -75 +87 @@
       }
 
-      sb.AppendLine("\\end{tikzpicture}" + nl + "\\end{document}" + nl);
-
+      sb.Append("\\end{tikzpicture}" + nl +
+                "\\end{document}" + nl);
       return sb.ToString();
     }