Changeset 14520

Timestamp:

12/22/16 11:18:55 (7 years ago)

Author:

bburlacu

Message:

#2704: Improve infix formatting

File:

• branches/HeuristicLab.ExpressionGenerator/HeuristicLab.ExpressionGenerator/3.4/Expression.cs (modified) (2 diffs)

branches/HeuristicLab.ExpressionGenerator/HeuristicLab.ExpressionGenerator/3.4/Expression.cs

@@ -118 +118 @@
             break;
           var args = Arguments.ToList();
-          sb.Append("(");
           // the Label should be known to the infix parser
           if (Label == "+" || Label == "-" || Label == "*" || Label == "/") {
-            if (Label == "/")
-              sb.Append("1 / ");
             if (args.Count == 1) {
-              sb.Append(string.Format("{0}", args[0].PrintInfix()));
+              sb.Append(string.Format(Label == "/" ? "1 / {0}" : "{0}", args[0].PrintInfix()));
             } else {
-              sb.Append("(");
-              var last = args.Last();
-              for (int i = 0; i < args.Count - 1; ++i) {
-                var arg = args[i];
-                sb.Append(string.Format("{0} {1} ", arg.PrintInfix(), Label));
+              if (Label == "/") {
+                sb.Append(string.Format("{0} / ", args[0].PrintInfix()));
+                var remaining = args.Count - 1;
+                if (remaining == 1)
+                  sb.Append(args[1].PrintInfix());
+                else {
+                  sb.Append("(");
+                  var last = args.Last();
+                  for (int i = 1; i < args.Count - 1; ++i) {
+                    var arg = args[i];
+                    sb.Append(string.Format("{0} {1} ", arg.PrintInfix(), "*"));
+                  }
+                  sb.Append(string.Format("{0})", last.PrintInfix()));
+                }
+              } else {
+                sb.Append("(");
+                var last = args.Last();
+                for (int i = 0; i < args.Count - 1; ++i) {
+                  var arg = args[i];
+                  sb.Append(string.Format("{0} {1} ", arg.PrintInfix(), Label));
+                }
+                sb.Append(string.Format("{0})", last.PrintInfix()));
               }
-              sb.Append(string.Format("{0})", last.PrintInfix()));
             }
           } else {
@@ -139 +152 @@
             for (int i = 0; i < args.Count - 1; ++i) {
               var arg = args[i];
-              sb.Append(string.Format("{0}, ", arg.PrintInfix(), Label));
+              sb.Append(string.Format("{0}, ", arg.PrintInfix()));
             }
             sb.Append(string.Format("{0})", last.PrintInfix()));
           }
-          sb.Append(")");
           break;
       }