添加 支持Round(double) 公式

Author: toolgood

csharp/ToolGood.Algorithm2/Internals/ConditionCacheInfo.cs

@@ -59,15 +59,15 @@ private ProgContext Parse(string exp)
                 var lexer = new mathLexer(stream);
                 var tokens = new CommonTokenStream(lexer);
                 var parser = new mathParser(tokens);
-                var antlrErrorListener = new AntlrErrorListener();
-                parser.RemoveErrorListeners();
-                parser.AddErrorListener(antlrErrorListener);
+                //var antlrErrorListener = new AntlrErrorListener();
+                //parser.RemoveErrorListeners();
+                //parser.AddErrorListener(antlrErrorListener);
 
                 var context = parser.prog();
-                if (antlrErrorListener.IsError) {
-                    LastError = antlrErrorListener.ErrorMsg;
-                    return null;
-                }
+                //if (antlrErrorListener.IsError) {
+                //    LastError = antlrErrorListener.ErrorMsg;
+                //    return null;
+                //}
                 return context;
             } catch (Exception ex) {
                 LastError = ex.Message + "\r\n" + ex.StackTrace;

csharp/ToolGood.Algorithm2/Internals/DiyNameVisitor.cs

@@ -294,11 +294,6 @@ public object VisitEXPONDIST_fun(mathParser.EXPONDIST_funContext context)
             return VisitChildren(context);
         }
 
-        public object VisitExpr2_fun(mathParser.Expr2_funContext context)
-        {
-            return VisitChildren(context);
-        }
-
         public object VisitEXP_fun(mathParser.EXP_funContext context)
         {
             return VisitChildren(context);

csharp/ToolGood.Algorithm2/Internals/MathSplitVisitor.cs

@@ -308,11 +308,6 @@ public ConditionTree VisitEXPONDIST_fun(mathParser.EXPONDIST_funContext context)
             return Visit_fun(context);
         }
 
-        public ConditionTree VisitExpr2_fun(mathParser.Expr2_funContext context)
-        {
-            return Visit_fun(context);
-        }
-
         public ConditionTree VisitEXP_fun(mathParser.EXP_funContext context)
         {
             return Visit_fun(context);

csharp/ToolGood.Algorithm2/Internals/MathVisitor.cs

@@ -1035,8 +1035,10 @@ public Operand VisitROUND_fun(mathParser.ROUND_funContext context)
             foreach (var item in context.expr()) { var aa = this.Visit(item).ToNumber($"Function ROUND parameter {index++} is error!"); if (aa.IsError) { return aa; } args.Add(aa); }
 
             var firstValue = args[0];
+            if (args.Count==1) {
+                return Operand.Create((double)Math.Round((decimal)firstValue.NumberValue,0, MidpointRounding.AwayFromZero));
+            }
             var secondValue = args[1];
-
             return Operand.Create((double)Math.Round((decimal)firstValue.NumberValue, secondValue.IntValue, MidpointRounding.AwayFromZero));
         }
         public Operand VisitROUNDDOWN_fun(mathParser.ROUNDDOWN_funContext context)
@@ -3882,10 +3884,6 @@ public Operand VisitGetJsonValue_fun(mathParser.GetJsonValue_funContext context)
             return Operand.Error(" Operator is error!");
         }
 
-        public Operand VisitExpr2_fun(mathParser.Expr2_funContext context)
-        {
-            return VisitChildren(context);
-        }
 
         public Operand VisitDiyFunction_fun(mathParser.DiyFunction_funContext context)
         {