Changeset 14823 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters

Timestamp:

04/04/17 16:53:00 (8 years ago)

Author:

gkronber

Message:

#2650: fixed round-trip for binary factor variables (and formatting changes)

File:

• branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/InfixExpressionFormatter.cs (modified) (9 diffs)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/InfixExpressionFormatter.cs

@@ -60 +60 @@
 
     private void FormatRecursively(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
-      if(node.SubtreeCount > 1) {
+      if (node.SubtreeCount > 1) {
         var token = GetToken(node.Symbol);
-        if(token == "+" || token == "-" || token == "OR" || token == "XOR") {
+        if (token == "+" || token == "-" || token == "OR" || token == "XOR") {
           strBuilder.Append("(");
           FormatRecursively(node.Subtrees.First(), strBuilder);
 
-          foreach(var subtree in node.Subtrees.Skip(1)) {
+          foreach (var subtree in node.Subtrees.Skip(1)) {
             strBuilder.Append(" ").Append(token).Append(" ");
             FormatRecursively(subtree, strBuilder);
@@ -72 +72 @@
           strBuilder.Append(")");
 
-        } else if(token == "*" || token == "/" || token == "AND") {
+        } else if (token == "*" || token == "/" || token == "AND") {
           strBuilder.Append("(");
           FormatRecursively(node.Subtrees.First(), strBuilder);
 
-          foreach(var subtree in node.Subtrees.Skip(1)) {
+          foreach (var subtree in node.Subtrees.Skip(1)) {
             strBuilder.Append(" ").Append(token).Append(" ");
             FormatRecursively(subtree, strBuilder);
@@ -85 +85 @@
           strBuilder.Append(token).Append("(");
           FormatRecursively(node.Subtrees.First(), strBuilder);
-          foreach(var subtree in node.Subtrees.Skip(1)) {
+          foreach (var subtree in node.Subtrees.Skip(1)) {
             strBuilder.Append(", ");
             FormatRecursively(subtree, strBuilder);
@@ -91 +91 @@
           strBuilder.Append(")");
         }
-      } else if(node.SubtreeCount == 1) {
+      } else if (node.SubtreeCount == 1) {
         var token = GetToken(node.Symbol);
-        if(token == "-" || token == "NOT") {
+        if (token == "-" || token == "NOT") {
           strBuilder.Append("(").Append(token).Append("(");
           FormatRecursively(node.GetSubtree(0), strBuilder);
           strBuilder.Append("))");
-        } else if(token == "/") {
+        } else if (token == "/") {
           strBuilder.Append("1/");
           FormatRecursively(node.GetSubtree(0), strBuilder);
-        } else if(token == "+" || token == "*") {
+        } else if (token == "+" || token == "*") {
           FormatRecursively(node.GetSubtree(0), strBuilder);
         } else {
@@ -110 +110 @@
       } else {
         // no subtrees
-        if(node.Symbol is LaggedVariable) {
+        if (node.Symbol is LaggedVariable) {
           var varNode = node as LaggedVariableTreeNode;
-          if(!varNode.Weight.IsAlmost(1.0)) {
+          if (!varNode.Weight.IsAlmost(1.0)) {
             strBuilder.Append("(");
             strBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0}", varNode.Weight);
@@ -118 +118 @@
           }
           strBuilder.Append("LAG(");
-          if(varNode.VariableName.Contains("'")) {
+          if (varNode.VariableName.Contains("'")) {
             strBuilder.AppendFormat("\"{0}\"", varNode.VariableName);
           } else {
@@ -126 +126 @@
             .AppendFormat(CultureInfo.InvariantCulture, "{0}", varNode.Lag)
             .Append(")");
-        } else if(node.Symbol is Variable) {
+        } else if (node.Symbol is Variable) {
           var varNode = node as VariableTreeNode;
-          if(!varNode.Weight.IsAlmost(1.0)) {
+          if (!varNode.Weight.IsAlmost(1.0)) {
             strBuilder.Append("(");
             strBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0}", varNode.Weight);
             strBuilder.Append("*");
           }
-          if(varNode.VariableName.Contains("'")) {
+          if (varNode.VariableName.Contains("'")) {
             strBuilder.AppendFormat("\"{0}\"", varNode.VariableName);
           } else {
             strBuilder.AppendFormat("'{0}'", varNode.VariableName);
           }
-          if(!varNode.Weight.IsAlmost(1.0)) {
+          if (!varNode.Weight.IsAlmost(1.0)) {
             strBuilder.Append(")");
           }
-        } else if(node.Symbol is FactorVariable) {
+        } else if (node.Symbol is FactorVariable) {
           var factorNode = node as FactorVariableTreeNode;
-          if(factorNode.VariableName.Contains("'")) {
+          if (factorNode.VariableName.Contains("'")) {
             strBuilder.AppendFormat("\"{0}\"", factorNode.VariableName);
           } else {
@@ -150 +150 @@
           strBuilder.AppendFormat("[{0}]",
             string.Join(", ", factorNode.Weights.Select(w => w.ToString(CultureInfo.InvariantCulture))));
-        } else if(node.Symbol is BinaryFactorVariable) {
+        } else if (node.Symbol is BinaryFactorVariable) {
           var factorNode = node as BinaryFactorVariableTreeNode;
-          if(!factorNode.Weight.IsAlmost(1.0)) {
+          if (!factorNode.Weight.IsAlmost(1.0)) {
             strBuilder.Append("(");
             strBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0}", factorNode.Weight);
             strBuilder.Append("*");
           }
-          if(factorNode.VariableName.Contains("'")) {
-            strBuilder.AppendFormat("\"{0}={1}\"", factorNode.VariableName, factorNode.VariableValue);
+          if (factorNode.VariableName.Contains("'")) {
+            strBuilder.AppendFormat("\"{0}\"", factorNode.VariableName);
           } else {
-            strBuilder.AppendFormat("'{0}={1}'", factorNode.VariableName, factorNode.VariableValue);
+            strBuilder.AppendFormat("'{0}'", factorNode.VariableName);
           }
-          if(!factorNode.Weight.IsAlmost(1.0)) {
+          strBuilder.Append(" = ");
+          if (factorNode.VariableValue.Contains("'")) {
+            strBuilder.AppendFormat("\"{0}\"", factorNode.VariableValue);
+          } else {
+            strBuilder.AppendFormat("'{0}'", factorNode.VariableValue);
+          }
+
+          if (!factorNode.Weight.IsAlmost(1.0)) {
             strBuilder.Append(")");
           }
 
-        } else if(node.Symbol is Constant) {
+        } else if (node.Symbol is Constant) {
           var constNode = node as ConstantTreeNode;
-          if(constNode.Value >= 0.0)
+          if (constNode.Value >= 0.0)
             strBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0}", constNode.Value);
           else
@@ -178 +185 @@
     private string GetToken(ISymbol symbol) {
       var tok = InfixExpressionParser.knownSymbols.GetBySecond(symbol).SingleOrDefault();
-      if(tok == null)
+      if (tok == null)
         throw new ArgumentException(string.Format("Unknown symbol {0} found.", symbol.Name));
       return tok;