Skip to content

Commit 4d3b20a

Browse files
author
linzhijun
committed
fix
1 parent 44ec67c commit 4d3b20a

File tree

6 files changed

+126
-86
lines changed

6 files changed

+126
-86
lines changed

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
7878
if (args1.NumberValue < 0) {
7979
return Operand.Error("Function '{0}' parameter is error!", "Sqrt");
8080
}
81-
return Operand.Create(Math.Sqrt((double)args1.DoubleValue));
81+
return Operand.Create(Math.Sqrt(args1.DoubleValue));
8282
}
8383
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
8484
{
@@ -236,7 +236,7 @@ public Function_DEGREES(FunctionBase func1) : base(func1)
236236
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
237237
{
238238
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Degrees"); if (args1.IsError) { return args1; } }
239-
var z = (double)args1.DoubleValue;
239+
var z = args1.DoubleValue;
240240
var r = (z / Math.PI * 180);
241241
return Operand.Create(r);
242242
}
@@ -255,7 +255,7 @@ public Function_RADIANS(FunctionBase func1) : base(func1)
255255
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
256256
{
257257
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Radians"); if (args1.IsError) { return args1; } }
258-
var r = (double)args1.DoubleValue / 180 * Math.PI;
258+
var r = args1.DoubleValue / 180 * Math.PI;
259259
return Operand.Create(r);
260260
}
261261
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
@@ -273,7 +273,7 @@ public Function_COS(FunctionBase func1) : base(func1)
273273
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
274274
{
275275
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Cos"); if (args1.IsError) { return args1; } }
276-
return Operand.Create(Math.Cos((double)args1.DoubleValue));
276+
return Operand.Create(Math.Cos(args1.DoubleValue));
277277
}
278278
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
279279
{
@@ -290,7 +290,7 @@ public Function_SIN(FunctionBase func1) : base(func1)
290290
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
291291
{
292292
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Sin"); if (args1.IsError) { return args1; } }
293-
return Operand.Create(Math.Sin((double)args1.DoubleValue));
293+
return Operand.Create(Math.Sin(args1.DoubleValue));
294294
}
295295
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
296296
{
@@ -307,7 +307,7 @@ public Function_TAN(FunctionBase func1) : base(func1)
307307
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
308308
{
309309
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Tan"); if (args1.IsError) { return args1; } }
310-
return Operand.Create(Math.Tan((double)args1.DoubleValue));
310+
return Operand.Create(Math.Tan(args1.DoubleValue));
311311
}
312312
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
313313
{
@@ -324,7 +324,7 @@ public Function_ACOS(FunctionBase func1) : base(func1)
324324
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
325325
{
326326
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Acos"); if (args1.IsError) { return args1; } }
327-
var x = args1.NumberValue;
327+
var x = args1.DoubleValue;
328328
if (x < -1 || x > 1) {
329329
return Operand.Error("Function '{0}' parameter is error!", "Acos");
330330
}
@@ -345,7 +345,7 @@ public Function_ASIN(FunctionBase func1) : base(func1)
345345
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
346346
{
347347
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Asin"); if (args1.IsError) { return args1; } }
348-
var x = args1.NumberValue;
348+
var x = args1.DoubleValue;
349349
if (x < -1 || x > 1) {
350350
return Operand.Error("Function '{0}' parameter is error!", "Asin");
351351
}
@@ -366,7 +366,7 @@ public Function_ATAN(FunctionBase func1) : base(func1)
366366
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
367367
{
368368
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Atan"); if (args1.IsError) { return args1; } }
369-
return Operand.Create(Math.Atan((double)args1.DoubleValue));
369+
return Operand.Create(Math.Atan(args1.DoubleValue));
370370
}
371371
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
372372
{
@@ -384,7 +384,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
384384
{
385385
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter {1} is error!", "Atan2", 1); if (args1.IsError) { return args1; } }
386386
var args2 = func2.Evaluate(work, tempParameter); if (args2.IsNotNumber) { args2 = args2.ToNumber("Function '{0}' parameter {1} is error!", "Atan2", 2); if (args2.IsError) { return args2; } }
387-
return Operand.Create(Math.Atan2((double)args2.DoubleValue, (double)args1.DoubleValue));
387+
return Operand.Create(Math.Atan2(args2.DoubleValue, args1.DoubleValue));
388388
}
389389
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
390390
{
@@ -401,7 +401,7 @@ public Function_COT(FunctionBase func1) : base(func1)
401401
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
402402
{
403403
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Cot"); if (args1.IsError) { return args1; } }
404-
var d = Math.Tan((double)args1.DoubleValue);
404+
var d = Math.Tan(args1.DoubleValue);
405405
if (d == 0) {
406406
return Operand.Error("Function '{0}' div 0 error!", "Cot");
407407
}
@@ -422,7 +422,7 @@ public Function_SEC(FunctionBase func1) : base(func1)
422422
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
423423
{
424424
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Sec"); if (args1.IsError) { return args1; } }
425-
var d = Math.Cos((double)args1.DoubleValue);
425+
var d = Math.Cos(args1.DoubleValue);
426426
if (d == 0) {
427427
return Operand.Error("Function '{0}' div 0 error!", "Sec");
428428
}
@@ -443,7 +443,7 @@ public Function_CSC(FunctionBase func1) : base(func1)
443443
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
444444
{
445445
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Csc"); if (args1.IsError) { return args1; } }
446-
var d = Math.Sin((double)args1.DoubleValue);
446+
var d = Math.Sin(args1.DoubleValue);
447447
if (d == 0) {
448448
return Operand.Error("Function '{0}' div 0 error!", "Csc");
449449
}
@@ -464,7 +464,7 @@ public Function_COSH(FunctionBase func1) : base(func1)
464464
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
465465
{
466466
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Cosh"); if (args1.IsError) { return args1; } }
467-
return Operand.Create(Math.Cosh((double)args1.DoubleValue));
467+
return Operand.Create(Math.Cosh(args1.DoubleValue));
468468
}
469469
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
470470
{
@@ -481,7 +481,7 @@ public Function_SINH(FunctionBase func1) : base(func1)
481481
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
482482
{
483483
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Sinh"); if (args1.IsError) { return args1; } }
484-
return Operand.Create(Math.Sinh((double)args1.DoubleValue));
484+
return Operand.Create(Math.Sinh(args1.DoubleValue));
485485
}
486486
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
487487
{
@@ -498,7 +498,7 @@ public Function_TANH(FunctionBase func1) : base(func1)
498498
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
499499
{
500500
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Tanh"); if (args1.IsError) { return args1; } }
501-
return Operand.Create(Math.Tanh((double)args1.DoubleValue));
501+
return Operand.Create(Math.Tanh(args1.DoubleValue));
502502
}
503503
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
504504
{
@@ -515,7 +515,7 @@ public Function_ACOSH(FunctionBase func1) : base(func1)
515515
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
516516
{
517517
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Acosh"); if (args1.IsError) { return args1; } }
518-
var z = args1.NumberValue;
518+
var z = args1.DoubleValue;
519519
if (z < 1) {
520520
return Operand.Error("Function '{0}' parameter is error!", "Acosh");
521521
}
@@ -536,7 +536,7 @@ public Function_ASINH(FunctionBase func1) : base(func1)
536536
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
537537
{
538538
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Asinh"); if (args1.IsError) { return args1; } }
539-
return Operand.Create(Math.Asinh((double)args1.DoubleValue));
539+
return Operand.Create(Math.Asinh(args1.DoubleValue));
540540
}
541541
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
542542
{
@@ -913,7 +913,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
913913
var args2 = func2.Evaluate(work, tempParameter); if (args2.IsNotNumber) { args2 = args2.ToNumber("Function '{0}' parameter {1} is error!", "RoundUp", 2); if (args2.IsError) { return args2; } }
914914
if (args1.NumberValue == 0.0m) { return args1; }
915915
var a = Math.Pow(10, args2.IntValue);
916-
var b = args1.NumberValue;
916+
var b = args1.DoubleValue;
917917

918918
var t = (Math.Ceiling(Math.Abs((double)b) * a)) / a;
919919
if (b > 0) return Operand.Create(t);
@@ -1278,7 +1278,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
12781278
{
12791279
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter {1} is error!", "Power", 1); if (args1.IsError) { return args1; } }
12801280
var args2 = func2.Evaluate(work, tempParameter); if (args2.IsNotNumber) { args2 = args2.ToNumber("Function '{0}' parameter {1} is error!", "Power", 2); if (args2.IsError) { return args2; } }
1281-
return Operand.Create(Math.Pow((double)args1.DoubleValue, (double)args2.DoubleValue));
1281+
return Operand.Create(Math.Pow(args1.DoubleValue, args2.DoubleValue));
12821282
}
12831283
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
12841284
{
@@ -1295,7 +1295,7 @@ public Function_EXP(FunctionBase func1) : base(func1)
12951295
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
12961296
{
12971297
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Exp"); if (args1.IsError) { return args1; } }
1298-
return Operand.Create(Math.Exp((double)args1.DoubleValue));
1298+
return Operand.Create(Math.Exp(args1.DoubleValue));
12991299
}
13001300
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
13011301
{
@@ -1312,7 +1312,7 @@ public Function_LN(FunctionBase func1) : base(func1)
13121312
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
13131313
{
13141314
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Ln"); if (args1.IsError) { return args1; } }
1315-
var z = args1.NumberValue;
1315+
var z = args1.DoubleValue;
13161316
if (z <= 0) {
13171317
return Operand.Error("Function '{0}' parameter is error!", "Ln");
13181318
}
@@ -1335,9 +1335,9 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
13351335
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter {1} is error!", "Log", 1); if (args1.IsError) { return args1; } }
13361336
if (func2 != null) {
13371337
var args2 = func2.Evaluate(work, tempParameter); if (args2.IsNotNumber) { args2 = args2.ToNumber("Function '{0}' parameter {1} is error!", "Log", 2); if (args2.IsError) { return args2; } }
1338-
return Operand.Create(Math.Log((double)args1.DoubleValue, (double)args2.DoubleValue));
1338+
return Operand.Create(Math.Log(args1.DoubleValue, args2.DoubleValue));
13391339
}
1340-
return Operand.Create(Math.Log((double)args1.DoubleValue, 10));
1340+
return Operand.Create(Math.Log(args1.DoubleValue, 10));
13411341
}
13421342
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
13431343
{
@@ -1413,7 +1413,7 @@ public Function_SQRTPI(FunctionBase func1) : base(func1)
14131413
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
14141414
{
14151415
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "SqrtPI"); if (args1.IsError) { return args1; } }
1416-
return Operand.Create(Math.Sqrt((double)args1.DoubleValue * Math.PI));
1416+
return Operand.Create(Math.Sqrt(args1.DoubleValue * Math.PI));
14171417
}
14181418
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
14191419
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public Function_CHAR(FunctionBase func1) : base(func1)
7878
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
7979
{
8080
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Char"); if (args1.IsError) { return args1; } }
81-
char c = (char)(int)args1.NumberValue;
81+
char c = (char)args1.IntValue;
8282
return Operand.Create(c.ToString());
8383
}
8484
public override void ToString(StringBuilder stringBuilder, bool addBrackets)

0 commit comments

Comments
 (0)