Changeset 16340

Timestamp:

12/06/18 16:04:56 (5 years ago)

Author:

chaider

Message:

#2968 Changed formating of constant list

File:

• branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/InfixExpressionStringFormatter.cs (modified) (4 diffs)

branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/InfixExpressionStringFormatter.cs

@@ -15 +15 @@
   public sealed class InfixExpressionStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
     private readonly List<KeyValuePair<string, double>> constants;
-    private static int constantCounter = 0;
+    private int constantCounter = 0;
 
     [StorableConstructor]
@@ -22 +22 @@
       : base(original, cloner) {
       constants = new List<KeyValuePair<string, double>>(original.constants);
+      constantCounter = original.constantCounter;
     }
     public InfixExpressionStringFormatter() : base() {
@@ -34 +35 @@
     public string Format(ISymbolicExpressionTree symbolicExpressionTree) {
       StringBuilder strBuilder = new StringBuilder();
+      constants.Clear();
+      constantCounter = 0;
       FormatRecursively(symbolicExpressionTree.Root.GetSubtree(0).GetSubtree(0), strBuilder);
       strBuilder.Append($"{Environment.NewLine}{Environment.NewLine}");
+
+      int maxDigits = GetDigits(constantCounter);
+      int padding = constants.Max(x => x.Value.ToString("F12", CultureInfo.InvariantCulture).Length);
       foreach (var constant in constants) {
-        strBuilder.Append($"{constant.Key} = {constant.Value}{Environment.NewLine}");
+        int digits = GetDigits(Int32.Parse(constant.Key.Substring(2)));
+        strBuilder.Append($"{constant.Key}{new String(' ', maxDigits - digits)} = " +
+          string.Format($"{{0,{padding}:F12}}", constant.Value, CultureInfo.InvariantCulture) + Environment.NewLine);
       }
       return strBuilder.ToString();
@@ -169 +177 @@
     }
 
+    private int GetDigits(int x) {
+      if (x < 10)
+        return 1;
+      else
+        return (int)Math.Floor(Math.Log10(x) + 1);
+    }
+
     private string GetToken(ISymbol symbol) {
       var tok = InfixExpressionParser.knownSymbols.GetBySecond(symbol).SingleOrDefault();