Changeset 18203 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

01/17/22 21:34:43 (3 years ago)

Author:

gkronber

Message:

#3145: fixed a bug in the infix formatter introduced in my earlier commit

File:

• trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/InfixExpressionFormatter.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/InfixExpressionFormatter.cs

@@ -39 +39 @@
         if (token == "+" || token == "-" || token == "OR" || token == "XOR") {
           var parenthesisRequired = false;
-          if (node.Parent != null && node.Parent.SubtreeCount > 1) {
+          if (node.Parent != null && IsOperator(node.Parent.Symbol)) {
             var parentOp = GetToken(node.Parent.Symbol);
             if (parentOp != "+" && parentOp != "-" && parentOp != "OR" && parentOp != "XOR")
@@ -154 +154 @@
         }
       }
+    }
+
+    private static bool IsOperator(ISymbol sy) {
+      return sy is Addition ||
+        sy is Subtraction ||
+        sy is Multiplication ||
+        sy is Division ||
+        sy is And ||
+        sy is Or ||
+        sy is Xor;
     }