Changeset 17434 for branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/Formatters

Timestamp:

02/11/20 13:36:02 (5 years ago)

Author:

bburlacu

Message:

#1772: Merge trunk changes and fix all errors and compilation warnings.

Location:

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

Files:

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

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/Formatters/SymbolicExpressionTreeLatexFormatter.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -36 +36 @@
       {"ProgramRootSymbol", "Prog"},
       {"StartSymbol","RPB"},
-      {"Multiplication", "$\\times$"},
-      {"Division", "$\\div$"},
-      {"Addition", "$+$"},
-      {"Subtraction", "$-$"},
-      {"Exponential", "$\\exp$"},
-      {"Logarithm", "$\\log$"}
+      // short form 
+      {"Subtraction", "-" },
+      {"Addition", "+" },
+      {"Multiplication", "*" },
+      {"Division", "/" },
+      {"Absolute", "abs" },
+      {"AnalyticQuotient", "AQ" },
+      {"Sine", "sin" },
+      {"Cosine", "cos" },
+      {"Tanget", "tan" },
+      {"HyperbolicTangent", "tanh" },
+      {"Exponential", "exp" },
+      {"Logarithm", "log" },
+      {"SquareRoot", "sqrt" },
+      {"Square", "sqr" },
+      {"CubeRoot", "cbrt" },
+      {"Cube", "cube" },
+      {"GreaterThan", ">" },
+      {"LessThan", "<" },
     };
 
@@ -65 +78 @@
 
     public string Format(ISymbolicExpressionTree symbolicExpressionTree) {
-      string s;
-      Format(symbolicExpressionTree, out s);
-      return s;
-    }
-
-    public Dictionary<ISymbolicExpressionTreeNode, string> Format(ISymbolicExpressionTree symbolicExpressionTree, out string str, int offset = 0) {
-      var nodeIds = new Dictionary<ISymbolicExpressionTreeNode, string>();
       var root = symbolicExpressionTree.Root;
       var actualRoot = root.SubtreeCount == 0 ? root.GetSubtree(0) : root;
@@ -85 +91 @@
                 "\\begin{tikzpicture}" + nl +
                 "\\def\\ws{1}" + nl +
-                "\\def\\hs{0.7}" + nl +
-                "\\def\\offs{" + offset + "}" + nl);
+                "\\def\\hs{0.7}" + nl);
 
+      var nodeIndices = new Dictionary<ISymbolicExpressionTreeNode, int>();
       var nodes = symbolicExpressionTree.IterateNodesBreadth().ToList();
       for (int i = 0; i < nodes.Count; ++i) {
         var node = nodes[i];
-        var id = Guid.NewGuid().ToString();
-        nodeIds[node] = id;
+        nodeIndices.Add(node, i);
         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} + \\offs,\\hs*{2}) {{{3}}};", nodeIds[node], ws * coord.X, -hs * coord.Y, EscapeLatexString(nodeName)));
+        sb.AppendLine(string.Format(CultureInfo.InvariantCulture, "\\node ({0}) at (\\ws*{1},\\hs*{2}) {{{3}}};", i, ws * coord.X, -hs * coord.Y, EscapeLatexString(nodeName)));
       }
 
       for (int i = 0; i < nodes.Count; ++i) {
-        var n = nodes[i];
         foreach (var s in nodes[i].Subtrees) {
-          sb.AppendLine(string.Format(CultureInfo.InvariantCulture, "\\draw ({0}) -- ({1});", nodeIds[n], nodeIds[s]));
+          sb.AppendLine(string.Format(CultureInfo.InvariantCulture, "\\draw ({0}) -- ({1});", i, nodeIndices[s]));
         }
       }
@@ -107 +111 @@
       sb.Append("\\end{tikzpicture}" + nl +
                 "\\end{document}" + nl);
-      str = sb.ToString();
-      return nodeIds;
+      return sb.ToString();
     }