Changeset 7463 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs

Timestamp:

02/07/12 12:35:42 (12 years ago)

Author:

gkronber

Message:

#1081 improved formatter, line chart view, simplifier for time series prognosis solutions

File:

• branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs (modified) (7 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs

@@ -33 +33 @@
   [StorableClass]
   public sealed class SymbolicDataAnalysisExpressionLatexFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
-    private List<double> constants;
+    private readonly List<double> constants;
+    private int targetCount;
     private int currentLag;
 
@@ -57 +58 @@
         StringBuilder strBuilder = new StringBuilder();
         constants.Clear();
+        targetCount = 1;
         strBuilder.AppendLine(FormatRecursively(symbolicExpressionTree.Root));
         return strBuilder.ToString();
@@ -96 +98 @@
       } else if (node.Symbol is Division) {
         if (node.SubtreeCount == 1) {
-          strBuilder.Append(@" \cfrac{1}{");
+          strBuilder.Append(@" \cfrac{1");
         } else {
           strBuilder.Append(@" \cfrac{ ");
@@ -160 +162 @@
         strBuilder.Append(invokeNode.Symbol.FunctionName + @" \left( ");
       } else if (node.Symbol is StartSymbol) {
-        strBuilder.Append("Result & = ");
+        strBuilder.Append("target_" + (targetCount++) + "(t) & = ");
       } else if (node.Symbol is Argument) {
         var argSym = node.Symbol as Argument;
@@ -197 +199 @@
         strBuilder.Append(@" \cdot ");
       } else if (node.Symbol is Division) {
-        strBuilder.Append(@" }{ \cfrac{ ");
+        if (node.SubtreeCount <= 2)
+          strBuilder.Append(@" }{ ");
+        else
+          strBuilder.Append(@" }{ \cfrac{ ");
       } else if (node.Symbol is Average) {
         strBuilder.Append(@" + ");
@@ -228 +233 @@
         strBuilder.Append(" , ");
       } else if (node.Symbol is StartSymbol) {
-        strBuilder.Append(@"\\" + Environment.NewLine + " & ");
+        strBuilder.Append(@"\\" + Environment.NewLine);
+        strBuilder.Append("target_" + (targetCount++) + "(t) & = ");
       } else if (node.Symbol is Power) {
         strBuilder.Append(@"\right) ^ { \operatorname{round} \left(");
@@ -253 +259 @@
       } else if (node.Symbol is Division) {
         strBuilder.Append("} ");
-        if (node.SubtreeCount > 1)
-          strBuilder.Append("{1} ");
-        for (int i = 1; i < node.SubtreeCount; i++) {
+        if (node.SubtreeCount == 1 || node.SubtreeCount == 2)
           strBuilder.Append(" } ");
-        }
+        else
+          for (int i = 0; i < node.SubtreeCount; i++) {
+            strBuilder.Append(" } ");
+          }
       } else if (node.Symbol is Average) {
         strBuilder.Append(@" \right) ");