Changeset 5428 for trunk/sources

Timestamp:

02/04/11 11:34:59 (14 years ago)

Author:

gkronber

Message:

#1152 Merged LaTeX formatter from trunk and implemented formatting rules for new symbols (related to dynamic models).

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3

Files:

• HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) (1 diff)
• Symbolic/Formatters (added)
• Symbolic/Formatters/SymbolicExpressionTreeLatexFormatter.cs (copied) (copied from branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeLatexFormatter.cs) (10 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

@@ -108 +108 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Symbolic\Formatters\SymbolicExpressionTreeLatexFormatter.cs" />
     <Compile Include="Symbolic\Symbols\Root.cs" />
     <Compile Include="Symbolic\Symbols\Derivative.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeLatexFormatter.cs

@@ -35 +35 @@
   public sealed class SymbolicExpressionTreeLatexFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
     private List<double> constants;
+    private int currentLag;
 
     public SymbolicExpressionTreeLatexFormatter()
@@ -66 +67 @@
     private string FormatRecursively(SymbolicExpressionTreeNode node) {
       StringBuilder strBuilder = new StringBuilder();
-
+      currentLag = 0;
       FormatBegin(node, strBuilder);
 
@@ -87 +88 @@
         strBuilder.Append(@" \left( ");
       } else if (node.Symbol is Subtraction) {
-        strBuilder.Append(@" \left( ");
+        if (node.SubTrees.Count == 1) {
+          strBuilder.Append(@"- \left(");
+        } else {
+          strBuilder.Append(@" \left( ");
+        }
       } else if (node.Symbol is Multiplication) {
       } else if (node.Symbol is Division) {
-        if (node.SubTrees.Count != 2) throw new NotImplementedException("Division with more than 2 arguments is not implemented.");
-        strBuilder.Append(@" \frac{ ");
+        if (node.SubTrees.Count == 1) {
+          strBuilder.Append(@" \cfrac{1}{");
+        } else {
+          strBuilder.Append(@" \cfrac{ ");
+        }
       } else if (node.Symbol is Average) {
-        strBuilder.Append(@" \frac{1}{" + node.SubTrees.Count + @"} \left(");
+        // skip output of (1/1) if only one subtree
+        if (node.SubTrees.Count > 1) {
+          strBuilder.Append(@" \cfrac{1}{" + node.SubTrees.Count + @"}");
+        }
+        strBuilder.Append(@" \left(");
       } else if (node.Symbol is Logarithm) {
         strBuilder.Append(@"\log \left(");
@@ -113 +125 @@
         strBuilder.Append(@" \left( \left( ");
       } else if (node.Symbol is Not) {
-        strBuilder.Append(@" -1.0 \times \left( ");
+        strBuilder.Append(@" -1.0 \cdot \left( ");
       } else if (node.Symbol is IfThenElse) {
         strBuilder.Append(@"\left( \operatorname{if} \left( 0 < ");
       } else if (node.Symbol is Constant) {
-        strBuilder.Append("c_{" + constants.Count+"} ");
+        strBuilder.Append("c_{" + constants.Count + "} ");
         var constNode = node as ConstantTreeNode;
         constants.Add(constNode.Value);
+      } else if (node.Symbol is LaggedVariable) {
+        var laggedVarNode = node as LaggedVariableTreeNode;
+        strBuilder.Append("c_{" + constants.Count + "} " + laggedVarNode.VariableName);
+        strBuilder.Append(LagToString(currentLag + laggedVarNode.Lag));
+        constants.Add(laggedVarNode.Weight);
       } else if (node.Symbol is HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable) {
         var varNode = node as VariableTreeNode;
-        strBuilder.Append("c_{" + constants.Count + "} " + varNode.VariableName + " ");
+        strBuilder.Append("c_{" + constants.Count + "} " + varNode.VariableName);
+        strBuilder.Append(LagToString(currentLag));
         constants.Add(varNode.Weight);
-      } else if (node.Symbol is LaggedVariable) {
-        var laggedVarNode = node as LaggedVariableTreeNode;
-        strBuilder.Append("c_{" + constants.Count + "} " + laggedVarNode.VariableName + "(t" + laggedVarNode.Lag + ")");
-        constants.Add(laggedVarNode.Weight);
       } else if (node.Symbol is ProgramRootSymbol) {
       } else if (node.Symbol is Defun) {
@@ -140 +154 @@
         var argSym = node.Symbol as Argument;
         strBuilder.Append(" ARG+" + argSym.ArgumentIndex + " ");
+      } else if (node.Symbol is Derivative) {
+        strBuilder.Append(@" \cfrac{d \left(");
+      } else if (node.Symbol is TimeLag) {
+        var laggedNode = node as ILaggedTreeNode;
+        currentLag += laggedNode.Lag;
+      } else if (node.Symbol is Power) {
+        strBuilder.Append(@"\left(");
+      } else if (node.Symbol is Root) {
+        strBuilder.Append(@"\left(");
+      } else if (node.Symbol is Integral) {
+        // actually a new variable for t is needed in all subtrees (TODO)
+        var laggedTreeNode = node as ILaggedTreeNode;
+        strBuilder.Append(@"\sum_{t=" + (laggedTreeNode.Lag + currentLag) + @"}^0 \left(");
       } else {
         throw new NotImplementedException("Export of " + node.Symbol + " is not implemented.");
@@ -151 +178 @@
         strBuilder.Append(" - ");
       } else if (node.Symbol is Multiplication) {
-        strBuilder.Append(@" \times ");
+        strBuilder.Append(@" \cdot ");
       } else if (node.Symbol is Division) {
-        strBuilder.Append(" }{ ");
+        strBuilder.Append(@" }{ \cfrac{ ");
       } else if (node.Symbol is Average) {
         strBuilder.Append(@" + ");
@@ -185 +212 @@
       } else if (node.Symbol is StartSymbol) {
         strBuilder.Append(@"\\" + Environment.NewLine + " & ");
+      } else if (node.Symbol is Power) {
+        strBuilder.Append(@"\right) ^ { \operatorname{round} \left(");
+      } else if (node.Symbol is Root) {
+        strBuilder.Append(@"\right) ^ { \left( \cfrac{1}{ \operatorname{round} \left(");
       } else {
         throw new NotImplementedException("Export of " + node.Symbol + " is not implemented.");
@@ -197 +228 @@
       } else if (node.Symbol is Multiplication) {
       } else if (node.Symbol is Division) {
-        strBuilder.Append(" } ");
+        strBuilder.Append("} ");
+        if (node.SubTrees.Count > 1)
+          strBuilder.Append("{1} ");
+        for (int i = 1; i < node.SubTrees.Count; i++) {
+          strBuilder.Append(" } ");
+        }
       } else if (node.Symbol is Average) {
         strBuilder.Append(@" \right)");
@@ -223 +259 @@
         strBuilder.Append(@" \right) \right) ");
       } else if (node.Symbol is Constant) {
+      } else if (node.Symbol is LaggedVariable) {
       } else if (node.Symbol is HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable) {
-      } else if (node.Symbol is LaggedVariable) {
       } else if (node.Symbol is ProgramRootSymbol) {
         // output all constant values
@@ -240 +276 @@
       } else if (node.Symbol is StartSymbol) {
       } else if (node.Symbol is Argument) {
+      } else if (node.Symbol is Derivative) {
+        strBuilder.Append(@" \right) }{dt} ");
+      } else if (node.Symbol is TimeLag) {
+        var laggedNode = node as ILaggedTreeNode;
+        currentLag -= laggedNode.Lag;
+      } else if (node.Symbol is Power) {
+        strBuilder.Append(@"\right) } ");
+      } else if (node.Symbol is Root) {
+        strBuilder.Append(@"\right) } \right) } ");
+      } else if (node.Symbol is Integral) {
+        var laggedTreeNode = node as ILaggedTreeNode;
+        strBuilder.Append(@"\right) ");
       } else {
         throw new NotImplementedException("Export of " + node.Symbol + " is not implemented.");
       }
     }
+    private string LagToString(int lag) {
+      if (lag < 0) {
+        return "(t" + lag + ")";
+      } else if (lag > 0) {
+        return "(t+" + lag + ")";
+      } else return "(t)";
+    }
   }
 }