Changeset 17630 for branches/3040_VectorBasedGP

Timestamp:

06/23/20 16:11:21 (5 years ago)

Author:

pfleck

Message:

#3040

• Added aggregation symbols to latex formatter.
• Use boldsymbol for vector-variables.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs (modified) (5 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs

@@ -28 +28 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -239 +241 @@
           constIndex++;
         }
+
+        if (varNode.DataType == typeof(DoubleVector)) strBuilder.Append("\\boldsymbol{");
         strBuilder.Append(EscapeLatexString(varNode.VariableName));
+        if (varNode.DataType == typeof(DoubleVector)) strBuilder.Append("}"); // boldsymbol end
         strBuilder.Append(LagToString(currentLag));
       } else if (node.Symbol is ProgramRootSymbol) {
@@ -280 +285 @@
         constIndex++;
         strBuilder.Append(@" \left( " + p + @"\cdot ");
+      } else if (node.Symbol is Sum) {
+        strBuilder.Append(@"\operatorname{sum}\left(");
+      } else if (node.Symbol is Mean) {
+        strBuilder.Append(@"\operatorname{mean}\left(");
+      } else if (node.Symbol is Length) {
+        strBuilder.Append(@"\operatorname{length}\left(");
+      } else if (node.Symbol is StandardDeviation) {
+        strBuilder.Append(@"\operatorname{stdev}\left(");
+      } else if (node.Symbol is Variance) {
+        strBuilder.Append(@"\operatorname{var}\left(");
       } else {
         throw new NotImplementedException("Export of " + node.Symbol + " is not implemented.");
@@ -511 +526 @@
       } else if (node.Symbol is VariableCondition) {
         strBuilder.Append(@"\right) ");
+      } else if (node.Symbol is Sum) {
+        strBuilder.Append(@"\right) ");
+      } else if (node.Symbol is Mean) {
+        strBuilder.Append(@"\right) ");
+      } else if (node.Symbol is Length) {
+        strBuilder.Append(@"\right) ");
+      } else if (node.Symbol is StandardDeviation) {
+        strBuilder.Append(@"\right) ");
+      } else if (node.Symbol is Variance) {
+        strBuilder.Append(@"\right) ");
       } else {
         throw new NotImplementedException("Export of " + node.Symbol + " is not implemented.");
@@ -532 +557 @@
 
     private string EscapeLatexString(string s) {
-      return "\\text{" +
+      return "\\mathrm{" +
         s
          .Replace("\\", "\\\\")