Skip to content

Commit 6df6421

Browse files
author
linzhijun
committed
fix
1 parent 7faa32d commit 6df6421

File tree

1 file changed

+17
-32
lines changed

1 file changed

+17
-32
lines changed

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

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public Function_MAX(FunctionBase[] funcs) : base(funcs)
1515

1616
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
1717
{
18-
var args = new List<Operand>(); int index = 1;
19-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "Max", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
18+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
2019

2120
List<decimal> list = new List<decimal>();
2221
var o = FunctionUtil.F_base_GetList(args, list);
@@ -38,8 +37,7 @@ public Function_MIN(FunctionBase[] funcs) : base(funcs)
3837

3938
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
4039
{
41-
var args = new List<Operand>(); int index = 1;
42-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "Min", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
40+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
4341

4442
List<decimal> list = new List<decimal>();
4543
var o = FunctionUtil.F_base_GetList(args, list);
@@ -60,8 +58,7 @@ public Function_SUM(FunctionBase[] funcs) : base(funcs)
6058

6159
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
6260
{
63-
var args = new List<Operand>(); int index = 1;
64-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "Sum", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
61+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
6562

6663
List<decimal> list = new List<decimal>();
6764
var o = FunctionUtil.F_base_GetList(args, list);
@@ -131,8 +128,7 @@ public Function_AVEDEV(FunctionBase[] funcs) : base(funcs)
131128

132129
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
133130
{
134-
var args = new List<Operand>(); int index = 1;
135-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "AveDev", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
131+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
136132

137133
List<decimal> list = new List<decimal>();
138134
var o = FunctionUtil.F_base_GetList(args, list);
@@ -159,8 +155,7 @@ public Function_AVERAGE(FunctionBase[] funcs) : base(funcs)
159155

160156
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
161157
{
162-
var args = new List<Operand>(); int index = 1;
163-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "Average", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
158+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
164159

165160
List<decimal> list = new List<decimal>();
166161
var o = FunctionUtil.F_base_GetList(args, list);
@@ -238,8 +233,8 @@ public Function_COUNT(FunctionBase[] funcs) : base(funcs)
238233

239234
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
240235
{
241-
var args = new List<Operand>();
242-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
236+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
237+
243238
List<decimal> list = new List<decimal>();
244239
var o = FunctionUtil.F_base_GetList(args, list);
245240
if (o == false) { return Operand.Error("Function '{0}' parameter is error!", "Count"); }
@@ -296,8 +291,7 @@ public Function_MEDIAN(FunctionBase[] funcs) : base(funcs)
296291

297292
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
298293
{
299-
var args = new List<Operand>(); int index = 1;
300-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "Median", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
294+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
301295

302296
List<decimal> list = new List<decimal>();
303297
var o = FunctionUtil.F_base_GetList(args, list);
@@ -322,8 +316,7 @@ public Function_MODE(FunctionBase[] funcs) : base(funcs)
322316

323317
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
324318
{
325-
var args = new List<Operand>(); int index = 1;
326-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "Mode", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
319+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
327320

328321
List<decimal> list = new List<decimal>();
329322
var o = FunctionUtil.F_base_GetList(args, list);
@@ -428,8 +421,7 @@ public Function_GEOMEAN(FunctionBase[] funcs) : base(funcs)
428421

429422
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
430423
{
431-
var args = new List<Operand>(); int index = 1;
432-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "GeoMean", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
424+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
433425

434426
List<decimal> list = new List<decimal>();
435427
var o = FunctionUtil.F_base_GetList(args, list);
@@ -459,8 +451,7 @@ public Function_HARMEAN(FunctionBase[] funcs) : base(funcs)
459451

460452
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
461453
{
462-
var args = new List<Operand>(); int index = 1;
463-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "HarMean", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
454+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
464455

465456
if (args.Count == 1) return args[0];
466457

@@ -542,8 +533,7 @@ public Function_VARIANCE(FunctionBase[] funcs) : base(funcs)
542533

543534
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
544535
{
545-
var args = new List<Operand>(); int index = 1;
546-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "Variance", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
536+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
547537

548538
List<decimal> list = new List<decimal>();
549539
var o = FunctionUtil.F_base_GetList(args, list);
@@ -567,8 +557,7 @@ public Function_STDEV(FunctionBase[] funcs) : base(funcs)
567557

568558
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
569559
{
570-
var args = new List<Operand>(); int index = 1;
571-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "Stdev", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
560+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
572561

573562
List<decimal> list = new List<decimal>();
574563
var o = FunctionUtil.F_base_GetList(args, list);
@@ -596,8 +585,7 @@ public Function_STDEVP(FunctionBase[] funcs) : base(funcs)
596585

597586
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
598587
{
599-
var args = new List<Operand>(); int index = 1;
600-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "StdevP", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
588+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
601589

602590
List<decimal> list = new List<decimal>();
603591
var o = FunctionUtil.F_base_GetList(args, list);
@@ -624,8 +612,7 @@ public Function_DEVSQ(FunctionBase[] funcs) : base(funcs)
624612

625613
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
626614
{
627-
var args = new List<Operand>(); int index = 1;
628-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "DevSQ", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
615+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
629616

630617
List<decimal> list = new List<decimal>();
631618
var o = FunctionUtil.F_base_GetList(args, list);
@@ -652,8 +639,7 @@ public Function_VAR(FunctionBase[] funcs) : base(funcs)
652639

653640
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
654641
{
655-
var args = new List<Operand>(); int index = 1;
656-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "Var", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
642+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
657643

658644
if (args.Count == 1) { return Operand.Error("Function '{0}}' parameter only one error!", "Var"); }
659645

@@ -683,8 +669,7 @@ public Function_VARP(FunctionBase[] funcs) : base(funcs)
683669

684670
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
685671
{
686-
var args = new List<Operand>(); int index = 1;
687-
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsNotNumber) { aa = aa.ToNumber("Function '{0}' parameter {1} is error!", "VarP", index++); if (aa.IsError) { return aa; } } args.Add(aa); }
672+
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
688673

689674
if (args.Count == 1) { return Operand.Error("Function '{0}}' parameter only one error!", "VarP"); }
690675
List<decimal> list = new List<decimal>();

0 commit comments

Comments
 (0)