Changeset 6975 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

11/09/11 14:32:19 (13 years ago)

Author:

mkommend

Message:

#1579: Corrected handling of underscores in SymbolicDataAnalysisExpressionLatexFormatter.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
-using System.Linq;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using System.Collections.Generic;
-using System;
-using HeuristicLab.Core;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -137 +137 @@
       } else if (node.Symbol is LaggedVariable) {
         var laggedVarNode = node as LaggedVariableTreeNode;
-        strBuilder.Append("c_{" + constants.Count + "} " + laggedVarNode.VariableName);
+        strBuilder.Append("c_{" + constants.Count + "} " + EscapeLatexString(laggedVarNode.VariableName));
         strBuilder.Append(LagToString(currentLag + laggedVarNode.Lag));
         constants.Add(laggedVarNode.Weight);
       } else if (node.Symbol is HeuristicLab.Problems.DataAnalysis.Symbolic.Variable) {
         var varNode = node as VariableTreeNode;
-        strBuilder.Append("c_{" + constants.Count + "} " + varNode.VariableName);
+        strBuilder.Append("c_{" + constants.Count + "} " + EscapeLatexString(varNode.VariableName));
         strBuilder.Append(LagToString(currentLag));
         constants.Add(varNode.Weight);
@@ -174 +174 @@
         string p = @"1 / \left( 1 + \exp \left( - c_{" + constants.Count + "} ";
         constants.Add(conditionTreeNode.Slope);
-        p += @" \cdot \left(" + conditionTreeNode.VariableName + LagToString(currentLag) + " - c_{" + constants.Count + @"} \right) \right) \right)";
+        p += @" \cdot \left(" + EscapeLatexString(conditionTreeNode.VariableName) + LagToString(currentLag) + " - c_{" + constants.Count + @"} \right) \right) \right)";
         constants.Add(conditionTreeNode.Threshold);
         strBuilder.Append(@"\left( " + p + @"\cdot ");
@@ -230 +230 @@
         string p = @"1 / \left( 1 + \exp \left( - c_{" + constants.Count + "} ";
         constants.Add(conditionTreeNode.Slope);
-        p += @" \cdot \left(" + conditionTreeNode.VariableName + LagToString(currentLag) + " - c_{" + constants.Count + @"} \right) \right) \right)";
+        p += @" \cdot \left(" + EscapeLatexString(conditionTreeNode.VariableName) + LagToString(currentLag) + " - c_{" + constants.Count + @"} \right) \right) \right)";
         constants.Add(conditionTreeNode.Threshold);
         strBuilder.Append(@" + \left( 1 - " + p + @" \right) \cdot ");
@@ -311 +311 @@
       }
     }
+
     private string LagToString(int lag) {
       if (lag < 0) {
@@ -318 +319 @@
       } else return "(t)";
     }
+
+    private string EscapeLatexString(string s) {
+      return s.Replace(@"_", @"\_");
+    }
   }
 }