Changeset 18146 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs

Timestamp:

12/16/21 14:23:48 (2 years ago)

Author:

mkommend

Message:

#3136: Merged trunk changes into branch.

Location:

branches/3136_Structural_GP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs (modified) (11 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs

@@ -33 +33 @@
   [StorableType("D7186DFF-1596-4A58-B27D-974DF0D93E4F")]
   public sealed class SymbolicDataAnalysisExpressionLatexFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
-    private readonly List<KeyValuePair<string, double>> constants;
-    private int constIndex;
+    private readonly List<KeyValuePair<string, double>> parameters;
+    private int paramIdx;
     private int targetCount;
     private int currentLag;
@@ -44 +44 @@
     private SymbolicDataAnalysisExpressionLatexFormatter(SymbolicDataAnalysisExpressionLatexFormatter original, Cloner cloner)
       : base(original, cloner) {
-      constants = new List<KeyValuePair<string, double>>(original.constants);
-      constIndex = original.constIndex;
+      parameters = new List<KeyValuePair<string, double>>(original.parameters);
+      paramIdx = original.paramIdx;
       currentLag = original.currentLag;
       targetCount = original.targetCount;
@@ -53 +53 @@
       Name = ItemName;
       Description = ItemDescription;
-      constants = new List<KeyValuePair<string, double>>();
+      parameters = new List<KeyValuePair<string, double>>();
     }
 
@@ -66 +66 @@
       try {
         StringBuilder strBuilder = new StringBuilder();
-        constants.Clear();
-        constIndex = 0;
+        parameters.Clear();
+        paramIdx = 0;
         this.targetVariable = targetVariable;
         containsTimeSeriesSymbol = symbolicExpressionTree.IterateNodesBreadth().Any(n => IsTimeSeriesSymbol(n.Symbol));
@@ -189 +189 @@
       } else if (node.Symbol is IfThenElse) {
         strBuilder.Append(@" \operatorname{if}  \left( ");
-      } else if (node.Symbol is Constant) {
-        var constName = "c_{" + constIndex + "}";
-        constIndex++;
-        var constNode = node as ConstantTreeNode;
-        if (constNode.Value.IsAlmost(1.0)) {
+      } else if (node.Symbol is INumericSymbol numSy) {
+        var numName = "c_{" + paramIdx + "}";
+        paramIdx++;
+        var numericNode = node as INumericTreeNode;
+        if (numericNode.Value.IsAlmost(1.0)) {
           strBuilder.Append("1 ");
         } else {
-          strBuilder.Append(constName);
-          constants.Add(new KeyValuePair<string, double>(constName, constNode.Value));
-        }
-
+          strBuilder.Append(numName);
+          parameters.Add(new KeyValuePair<string, double>(numName, numericNode.Value));
+        }
       } else if (node.Symbol is FactorVariable) {
         var factorNode = node as FactorVariableTreeNode;
-        var constName = "c_{" + constIndex + "}";
-        strBuilder.Append(constName + " ");
+        var paramName = "c_{" + paramIdx + "}";
+        strBuilder.Append(paramName + " ");
         foreach (var e in factorNode.Symbol.GetVariableValues(factorNode.VariableName)
           .Zip(factorNode.Weights, Tuple.Create)) {
-          constants.Add(new KeyValuePair<string, double>("c_{" + constIndex + ", " + EscapeLatexString(factorNode.VariableName) + "=" + EscapeLatexString(e.Item1) + "}", e.Item2));
-        }
-        constIndex++;
+          parameters.Add(new KeyValuePair<string, double>("c_{" + paramIdx + ", " + EscapeLatexString(factorNode.VariableName) + "=" + EscapeLatexString(e.Item1) + "}", e.Item2));
+        }
+        paramIdx++;
       } else if (node.Symbol is BinaryFactorVariable) {
         var binFactorNode = node as BinaryFactorVariableTreeNode;
         if (!binFactorNode.Weight.IsAlmost((1.0))) {
-          var constName = "c_{" + constIndex + "}";
-          strBuilder.Append(constName + "  \\cdot");
-          constants.Add(new KeyValuePair<string, double>(constName, binFactorNode.Weight));
-          constIndex++;
+          var paramName = "c_{" + paramIdx + "}";
+          strBuilder.Append(paramName + "  \\cdot");
+          parameters.Add(new KeyValuePair<string, double>(paramName, binFactorNode.Weight));
+          paramIdx++;
         }
         strBuilder.Append("(" + EscapeLatexString(binFactorNode.VariableName));
@@ -223 +222 @@
         var laggedVarNode = node as LaggedVariableTreeNode;
         if (!laggedVarNode.Weight.IsAlmost(1.0)) {
-          var constName = "c_{" + constIndex + "}";
-          strBuilder.Append(constName + "  \\cdot");
-          constants.Add(new KeyValuePair<string, double>(constName, laggedVarNode.Weight));
-          constIndex++;
+          var paramName = "c_{" + paramIdx + "}";
+          strBuilder.Append(paramName + "  \\cdot");
+          parameters.Add(new KeyValuePair<string, double>(paramName, laggedVarNode.Weight));
+          paramIdx++;
         }
         strBuilder.Append(EscapeLatexString(laggedVarNode.VariableName));
@@ -234 +233 @@
         var varNode = node as VariableTreeNode;
         if (!varNode.Weight.IsAlmost((1.0))) {
-          var constName = "c_{" + constIndex + "}";
-          strBuilder.Append(constName + "  \\cdot");
-          constants.Add(new KeyValuePair<string, double>(constName, varNode.Weight));
-          constIndex++;
+          var paramName = "c_{" + paramIdx + "}";
+          strBuilder.Append(paramName + "  \\cdot");
+          parameters.Add(new KeyValuePair<string, double>(paramName, varNode.Weight));
+          paramIdx++;
         }
         strBuilder.Append(EscapeLatexString(varNode.VariableName));
@@ -271 +270 @@
       } else if (node.Symbol is VariableCondition) {
         var conditionTreeNode = node as VariableConditionTreeNode;
-        var constName = "c_{" + constants.Count + "}";
-        string p = @"1 /  1 + \exp  - " + constName + " ";
-        constants.Add(new KeyValuePair<string, double>(constName, conditionTreeNode.Slope));
-        constIndex++;
-        var const2Name = "c_{" + constants.Count + @"}";
+        var paramName = "c_{" + parameters.Count + "}";
+        string p = @"1 /  1 + \exp  - " + paramName + " ";
+        parameters.Add(new KeyValuePair<string, double>(paramName, conditionTreeNode.Slope));
+        paramIdx++;
+        var const2Name = "c_{" + parameters.Count + @"}";
         p += @" \cdot " + EscapeLatexString(conditionTreeNode.VariableName) + LagToString(currentLag) + " - " + const2Name + "   ";
-        constants.Add(new KeyValuePair<string, double>(const2Name, conditionTreeNode.Threshold));
-        constIndex++;
+        parameters.Add(new KeyValuePair<string, double>(const2Name, conditionTreeNode.Threshold));
+        paramIdx++;
         strBuilder.Append(@" \left( " + p + @"\cdot ");
       } else {
@@ -379 +378 @@
       } else if (node.Symbol is VariableCondition) {
         var conditionTreeNode = node as VariableConditionTreeNode;
-        var const1Name = "c_{" + constants.Count + "}";
+        var const1Name = "c_{" + parameters.Count + "}";
         string p = @"1 / \left( 1 + \exp \left( - " + const1Name + " ";
-        constants.Add(new KeyValuePair<string, double>(const1Name, conditionTreeNode.Slope));
-        constIndex++;
-        var const2Name = "c_{" + constants.Count + "}";
+        parameters.Add(new KeyValuePair<string, double>(const1Name, conditionTreeNode.Slope));
+        paramIdx++;
+        var const2Name = "c_{" + parameters.Count + "}";
         p += @" \cdot " + EscapeLatexString(conditionTreeNode.VariableName) + LagToString(currentLag) + " - " + const2Name + " \right) \right) \right)   ";
-        constants.Add(new KeyValuePair<string, double>(const2Name, conditionTreeNode.Threshold));
-        constIndex++;
+        parameters.Add(new KeyValuePair<string, double>(const2Name, conditionTreeNode.Threshold));
+        paramIdx++;
         strBuilder.Append(@" +  \left( 1 - " + p + @" \right) \cdot ");
       } else {
@@ -471 +470 @@
       } else if (node.Symbol is IfThenElse) {
         strBuilder.Append(@" \right) ");
+      } else if (node.Symbol is Number) {
       } else if (node.Symbol is Constant) {
       } else if (node.Symbol is LaggedVariable) {
@@ -481 +481 @@
           .AppendLine("\\begin{align*}")
           .AppendLine("\\nonumber");
-        // output all constant values
-        if (constants.Count > 0) {
-          foreach (var constant in constants) {
+        // output all parameter values
+        if (parameters.Count > 0) {
+          foreach (var param in parameters) {
             // replace "." with ".&" to align decimal points
-            var constStr = string.Format(System.Globalization.NumberFormatInfo.InvariantInfo, "{0:G5}", constant.Value);
-            if (!constStr.Contains(".")) constStr = constStr + ".0";
-            constStr = constStr.Replace(".", "&.");  // fix problem in rendering of aligned expressions
-            strBuilder.Append(constant.Key + "& = & " + constStr);
+            var paramStr = string.Format(System.Globalization.NumberFormatInfo.InvariantInfo, "{0:G5}", param.Value);
+            if (!paramStr.Contains(".")) paramStr = paramStr + ".0";
+            paramStr = paramStr.Replace(".", "&.");  // fix problem in rendering of aligned expressions
+            strBuilder.Append(param.Key + "& = & " + paramStr);
             strBuilder.Append(@"\\");
           }