Skip to content

Commit 44ec67c

Browse files
author
linzhijun
committed
fix
1 parent d9ccd5c commit 44ec67c

File tree

6 files changed

+1319
-1248
lines changed

6 files changed

+1319
-1248
lines changed

‎csharp/ToolGood.Algorithm/AlgorithmEngine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public float TryEvaluate(string exp, float def)
283283
return def;
284284
}
285285
}
286-
return (float)obj.NumberValue;
286+
return (float)obj.DoubleValue;
287287
} catch (Exception ex) {
288288
LastError = ex.Message + "\r\n" + ex.StackTrace;
289289
}
@@ -308,7 +308,7 @@ public double TryEvaluate(string exp, double def)
308308
return def;
309309
}
310310
}
311-
return (double)obj.NumberValue;
311+
return (double)obj.DoubleValue;
312312
} catch (Exception ex) {
313313
LastError = ex.Message + "\r\n" + ex.StackTrace;
314314
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public float TryEvaluate(AlgorithmEngine work, float def, Func<string, Operand>
190190
return def;
191191
}
192192
}
193-
return (float)obj.NumberValue;
193+
return (float)obj.DoubleValue;
194194
} catch (Exception ex) {
195195
work.LastError = ex.Message + "\r\n" + ex.StackTrace;
196196
}
@@ -215,7 +215,7 @@ public double TryEvaluate(AlgorithmEngine work, double def, Func<string, Operand
215215
return def;
216216
}
217217
}
218-
return (double)obj.NumberValue;
218+
return (double)obj.DoubleValue;
219219
} catch (Exception ex) {
220220
work.LastError = ex.Message + "\r\n" + ex.StackTrace;
221221
}

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

Lines changed: 22 additions & 22 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.NumberValue));
81+
return Operand.Create(Math.Sqrt((double)args1.DoubleValue));
8282
}
8383
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
8484
{
@@ -95,7 +95,7 @@ public Function_TRUNC(FunctionBase func1) : base(func1)
9595
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
9696
{
9797
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Trunc"); if (args1.IsError) { return args1; } }
98-
return Operand.Create((int)(args1.NumberValue));
98+
return Operand.Create((int)(args1.IntValue));
9999
}
100100
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
101101
{
@@ -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.NumberValue;
239+
var z = (double)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.NumberValue / 180 * Math.PI;
258+
var r = (double)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.NumberValue));
276+
return Operand.Create(Math.Cos((double)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.NumberValue));
293+
return Operand.Create(Math.Sin((double)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.NumberValue));
310+
return Operand.Create(Math.Tan((double)args1.DoubleValue));
311311
}
312312
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
313313
{
@@ -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.NumberValue));
369+
return Operand.Create(Math.Atan((double)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.NumberValue, (double)args1.NumberValue));
387+
return Operand.Create(Math.Atan2((double)args2.DoubleValue, (double)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.NumberValue);
404+
var d = Math.Tan((double)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.NumberValue);
425+
var d = Math.Cos((double)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.NumberValue);
446+
var d = Math.Sin((double)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.NumberValue));
467+
return Operand.Create(Math.Cosh((double)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.NumberValue));
484+
return Operand.Create(Math.Sinh((double)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.NumberValue));
501+
return Operand.Create(Math.Tanh((double)args1.DoubleValue));
502502
}
503503
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
504504
{
@@ -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.NumberValue));
539+
return Operand.Create(Math.Asinh((double)args1.DoubleValue));
540540
}
541541
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
542542
{
@@ -553,7 +553,7 @@ public Function_ATANH(FunctionBase func1) : base(func1)
553553
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
554554
{
555555
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter is error!", "Atanh"); if (args1.IsError) { return args1; } }
556-
var x = args1.NumberValue;
556+
var x = args1.DoubleValue;
557557
if (x >= 1 || x <= -1) {
558558
return Operand.Error("Function '{0}' parameter is error!", "Atanh");
559559
}
@@ -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.NumberValue, (double)args2.NumberValue));
1281+
return Operand.Create(Math.Pow((double)args1.DoubleValue, (double)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.NumberValue));
1298+
return Operand.Create(Math.Exp((double)args1.DoubleValue));
12991299
}
13001300
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
13011301
{
@@ -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.NumberValue, (double)args2.NumberValue));
1338+
return Operand.Create(Math.Log((double)args1.DoubleValue, (double)args2.DoubleValue));
13391339
}
1340-
return Operand.Create(Math.Log((double)args1.NumberValue, 10));
1340+
return Operand.Create(Math.Log((double)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.NumberValue * Math.PI));
1416+
return Operand.Create(Math.Sqrt((double)args1.DoubleValue * Math.PI));
14171417
}
14181418
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
14191419
{

0 commit comments

Comments
 (0)