fix

Author: linzhijun

csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.sum.cs

@@ -482,21 +482,16 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
         }
     }
 
-    internal class Function_PERCENTRANK : Function_N
+    internal class Function_PERCENTRANK : Function_3
     {
-        public Function_PERCENTRANK(FunctionBase[] funcs) : base(funcs)
+        public Function_PERCENTRANK(FunctionBase func1, FunctionBase func2, FunctionBase func3) : base(func1, func2, func3)
         {
         }
 
         public override Operand Calculate(AlgorithmEngine work)
         {
-            var args = new List<Operand>();
-            foreach (var item in funcs) { var aa = item.Calculate(work); if (aa.IsError) { return aa; } args.Add(aa); }
-
-            var args1 = args[0].ToArray("Function '{0}' parameter {1} is error!", "PercentRank", 1);
-            if (args1.IsError) { return args1; }
-            var args2 = args[1].ToNumber("Function '{0}' parameter {1} is error!", "PercentRank", 2);
-            if (args2.IsError) { return args2; }
+            var args1 = func1.Calculate(work); if (args1.Type != OperandType.ARRARY) { args1 = args1.ToArray("Function '{0}' parameter {1} is error!", "PercentRank", 1); if (args1.IsError) { return args1; } }
+            var args2 = func2.Calculate(work); if (args2.Type != OperandType.NUMBER) { args2 = args2.ToNumber("Function '{0}' parameter {1} is error!", "PercentRank", 2); if (args2.IsError) { return args2; } }
 
             List<decimal> list = new List<decimal>();
             var o = FunctionUtil.F_base_GetList(args1, list);
@@ -505,9 +500,8 @@ public override Operand Calculate(AlgorithmEngine work)
             var k = args2.NumberValue;
             var v = ExcelFunctions.PercentRank(list.Select(q => (double)q).ToArray(), (double)k);
             var d = 3;
-            if (args.Count == 3) {
-                var args3 = args[2].ToNumber("Function '{0}' parameter {1} is error!", "PercentRank", 3);
-                if (args3.IsError) { return args3; }
+            if (func3!=null) {
+                var args3 = func2.Calculate(work); if (args3.Type != OperandType.NUMBER) { args3 = args3.ToNumber("Function '{0}' parameter {1} is error!", "PercentRank", 3); if (args3.IsError) { return args3; } }
                 d = args3.IntValue;
             }
             return Operand.Create(Math.Round(v, d, MidpointRounding.AwayFromZero));

csharp/ToolGood.Algorithm/Internals/MathFunctionVisitor.cs

@@ -1224,11 +1224,11 @@ public FunctionBase VisitPERCENTILE_fun(mathParser.PERCENTILE_funContext context
         public FunctionBase VisitPERCENTRANK_fun(mathParser.PERCENTRANK_funContext context)
         {
             var exprs = context.expr();
-            FunctionBase[] args = new FunctionBase[exprs.Length];
-            for (int i = 0; i < exprs.Length; i++) {
-                args[i] = exprs[i].Accept(this);
-            }
-            return new Function_PERCENTRANK(args);
+            var args1 = exprs[0].Accept(this);
+            var args2 = exprs[1].Accept(this);
+            if (exprs.Length == 2) return new Function_PERCENTRANK(args1, args2, null);
+            var args3 = exprs[2].Accept(this);
+            return new Function_PERCENTRANK(args1, args2, args3);
         }
 
         public FunctionBase VisitAVERAGE_fun(mathParser.AVERAGE_funContext context)