Changeset 18115 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/InfixExpressionFormatter.cs

Timestamp:

12/13/21 17:49:34 (2 years ago)

Author:

gkronber

Message:

#3140: made several more changes for the constant -> number branch

File:

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

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/InfixExpressionFormatter.cs

@@ -54 +54 @@
 
           var power = node.GetSubtree(1);
-          if(power is NumberTreeNode constNode && Math.Truncate(constNode.Value) == constNode.Value) {
-            strBuilder.Append(" ").Append(token).Append(" ").Append(constNode.Value.ToString(formatString, numberFormat));
+          if(power is INumericTreeNode numNode && Math.Truncate(numNode.Value) == numNode.Value) {
+            strBuilder.Append(" ").Append(token).Append(" ").Append(numNode.Value.ToString(formatString, numberFormat));
           } else {
             strBuilder.Append(" ").Append(token).Append(" ");
@@ -141 +141 @@
 
           if (!factorNode.Weight.IsAlmost(1.0)) strBuilder.Append(")");
-        } else if (node.Symbol is Number) {
-          var numNode = node as NumberTreeNode;
+        } else if (node is INumericTreeNode numNode) {
           if (parameters == null && numNode.Value < 0) {
+            // negative value
             strBuilder.Append("(").Append(numNode.Value.ToString(formatString, numberFormat))
-                      .Append(")"); // (-1
+                      .Append(")"); 
           } else {
             AppendNumber(strBuilder, parameters, numNode.Value, formatString, numberFormat);