Changeset 4869

Timestamp:

11/20/10 02:15:09 (14 years ago)

Author:

swinkler

Message:

Fixed bugs in Smalltalk formatter. (#1270)

File:

• branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeSmalltalkStringFormatter.cs (modified) (6 diffs)

branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeSmalltalkStringFormatter.cs

@@ -59 +59 @@
         for (int i = 0; i < node.SubTrees.Count; i++) {
           if (i > 0) stringBuilder.Append("+");
-          stringBuilder.Append("(");
           stringBuilder.Append(FormatRecursively(node.SubTrees[i]));
-          stringBuilder.Append(")");
         }
       } else if (symbol is And) {
@@ -85 +83 @@
       } else if (symbol is Constant) {
         ConstantTreeNode constantTreeNode = node as ConstantTreeNode;
-        stringBuilder.Append(constantTreeNode.Value);
+        stringBuilder.Append(constantTreeNode.Value.ToString().Replace(",", "."));
       } else if (symbol is Cosine) {
         stringBuilder.Append(FormatRecursively(node.SubTrees[0]));
@@ -118 +116 @@
         stringBuilder.Append("] ifFalse: [");
         stringBuilder.Append(FormatRecursively(node.SubTrees[2]));
-        stringBuilder.Append("] )");
+        stringBuilder.Append("]");
       } else if (symbol is LaggedVariable) {
         stringBuilder.Append("not implemented");
@@ -136 +134 @@
         }
       } else if (symbol is Not) {
-        stringBuilder.Append("-");
+        stringBuilder.Append("-1*");
         stringBuilder.Append(FormatRecursively(node.SubTrees[0]));
       } else if (symbol is Or) {
@@ -152 +150 @@
       } else if (symbol is Subtraction) {
         if (node.SubTrees.Count == 1) {
-          stringBuilder.Append("-");
+          stringBuilder.Append("-1*");
           stringBuilder.Append(FormatRecursively(node.SubTrees[0]));
         } else {
@@ -166 +164 @@
       } else if (symbol is HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable) {
         VariableTreeNode variableTreeNode = node as VariableTreeNode;
-        stringBuilder.Append(variableTreeNode.Weight);
+        stringBuilder.Append(variableTreeNode.Weight.ToString().Replace(",", "."));
         stringBuilder.Append("*");
         stringBuilder.Append(variableTreeNode.VariableName);