修改 decimal 代替 double

linzhijun · linzhijun · commit a9aa13101c28 · 2023-03-18T11:10:36.000+08:00
diff --git a/csharp/ToolGood.Algorithm2.Test/AlgorithmEngine/AlgorithmEngineTest.cs b/csharp/ToolGood.Algorithm2.Test/AlgorithmEngine/AlgorithmEngineTest.cs
@@ -44,9 +44,9 @@ public void Test()
 
 
             var e = engine.TryEvaluate("e", 0.0);
-            Assert.AreEqual(Math.E, e);
+            Assert.AreEqual(Math.E, e,10);
             e = engine.TryEvaluate("pi", 0.0);
-            Assert.AreEqual(Math.PI, e);
+            Assert.AreEqual(Math.PI, e,10);
 
             var b = engine.TryEvaluate("true", true);
             Assert.AreEqual(true, b);
@@ -60,9 +60,9 @@ public void Test()
             Assert.AreEqual(2, b1);
 
             var b2 = engine.TryEvaluate("pi*4", 0.0);
-            Assert.AreEqual(Math.PI * 4, b2);
+            Assert.AreEqual(Math.PI * 4, b2,10);
             b2 = engine.TryEvaluate("e*4", 0.0);
-            Assert.AreEqual(Math.E * 4, b2);
+            Assert.AreEqual(Math.E * 4, b2,10);
 
             var s = engine.TryEvaluate("'aa'&'bb'", "");
             Assert.AreEqual("aabb", s);
@@ -246,7 +246,7 @@ public void Cylinder_Test()
             t = c.TryEvaluate("['半径']*[半径]*pi()*[高]", 0.0); //圆的体积
 
             t = c.TryEvaluate("求面积（10）", 0.0); //圆的体积
-            Assert.AreEqual(10 * 10 * Math.PI, t);
+            Assert.AreEqual(10 * 10 * Math.PI, t,10);
 
 
 
@@ -267,7 +267,7 @@ public void Test5555()
         {
             Cylinder c = new Cylinder(3, 10);
             String t = c.GetSimplifiedFormula("[半径]*[半径]*pi()"); // 圆底面积
-            Assert.AreEqual("3 * 3 * 3.141592653589793", t);
+            Assert.AreEqual("3 * 3 * 3.14159265358979", t);
 
             String t2 = c.GetSimplifiedFormula("半径*if(半径>2,1,3)");
             Assert.AreEqual("3 * 1", t2);
diff --git a/csharp/ToolGood.Algorithm2.Test/AlgorithmEngine/AlgorithmEngineTest_math.cs b/csharp/ToolGood.Algorithm2.Test/AlgorithmEngine/AlgorithmEngineTest_math.cs
@@ -129,7 +129,7 @@ public void RADIANS_test()
         {
             AlgorithmEngine engine = new AlgorithmEngine();
             var t = engine.TryEvaluate("RADIANS(180)", 0.0);
-            Assert.AreEqual(Math.PI, t);
+            Assert.AreEqual(Math.PI, t,10);
         }
         [Test]
         public void cos_test()
diff --git a/csharp/ToolGood.Algorithm2.Test/AlgorithmEngine/Cylinder.cs b/csharp/ToolGood.Algorithm2.Test/AlgorithmEngine/Cylinder.cs
@@ -39,7 +39,7 @@ protected override Operand ExecuteDiyFunction(string funcName, List<Operand> ope
             {
                 if (operands.Count == 1)
                 {
-                    var r = operands[0].ToNumber().NumberValue;
+                    var r = (double)operands[0].ToNumber().NumberValue;
                     return r * r * Math.PI;
                 }
             }
diff --git a/csharp/ToolGood.Algorithm2.Test/Program.cs b/csharp/ToolGood.Algorithm2.Test/Program.cs
@@ -15,7 +15,7 @@ static void Main(string[] args)
    
 
 
-            double a = 0.0;
+            decimal a = 0.0m;
             if (engine.Parse("1+2")) {
                 var o = engine.Evaluate();
                 a = o.NumberValue;
diff --git a/csharp/ToolGood.Algorithm2/AlgorithmEngine.cs b/csharp/ToolGood.Algorithm2/AlgorithmEngine.cs
@@ -558,7 +558,7 @@ public double TryEvaluate(string exp, double def)
                         LastError = obj.ErrorMsg;
                         return def;
                     }
-                    return obj.NumberValue;
+                    return (double)obj.NumberValue;
                 }
             } catch (Exception ex) {
                 LastError = ex.Message + "\r\n" + ex.StackTrace;
diff --git a/csharp/ToolGood.Algorithm2/AlgorithmEngineEx.cs b/csharp/ToolGood.Algorithm2/AlgorithmEngineEx.cs
@@ -626,7 +626,7 @@ public double TryEvaluateCategory(string categoryName, double def)
                     LastError = obj.ErrorMsg;
                     return def;
                 }
-                return obj.NumberValue;
+                return (double)obj.NumberValue;
             } catch (Exception ex) {
                 LastError = ex.Message + "\r\n" + ex.StackTrace;
             }
@@ -927,7 +927,7 @@ public double TryEvaluate(string exp, double def)
                     LastError = obj.ErrorMsg;
                     return def;
                 }
-                return obj.NumberValue;
+                return (double)obj.NumberValue;
             } catch (Exception ex) {
                 LastError = ex.Message + "\r\n" + ex.StackTrace;
             }
diff --git a/csharp/ToolGood.Algorithm2/Internals/MathVisitor.cs b/csharp/ToolGood.Algorithm2/Internals/MathVisitor.cs
diff --git a/csharp/ToolGood.Algorithm2/LitJson/IJsonWrapper.cs b/csharp/ToolGood.Algorithm2/LitJson/IJsonWrapper.cs
@@ -11,7 +11,7 @@ interface IJsonWrapper
         bool IsNull { get; }
 
         void SetBoolean(bool val);
-        void SetDouble(double val);
+        void SetDouble(decimal val);
         void SetJsonType(JsonType type);
         void SetString(string val);
         void SetNull();
diff --git a/csharp/ToolGood.Algorithm2/LitJson/JsonData.cs b/csharp/ToolGood.Algorithm2/LitJson/JsonData.cs
@@ -10,7 +10,7 @@ sealed  class JsonData : IJsonWrapper, IEnumerable
         #region Fields
         private IList<JsonData> inst_array;
         private bool inst_boolean;
-        private double inst_double;
+        private decimal inst_double;
         internal IDictionary<string, JsonData> inst_object;
         private string inst_string;
         private JsonType type;
@@ -72,10 +72,10 @@ void IJsonWrapper.SetBoolean(bool val)
             inst_boolean = val;
         }
 
-        void IJsonWrapper.SetDouble(double val)
+        void IJsonWrapper.SetDouble(decimal val)
         {
             type = JsonType.Double;
-            inst_double = val;
+            inst_double = (decimal)val;
         }
 
         void IJsonWrapper.SetString(string val)
@@ -154,7 +154,7 @@ void IJsonWrapper.SetJsonType(JsonType type)
                     break;
 
                 case JsonType.Double:
-                    inst_double = default(Double);
+                    inst_double = default(decimal);
                     break;
 
                 case JsonType.Boolean:
@@ -172,7 +172,7 @@ public IEnumerator GetEnumerator()
 
 
         public bool BooleanValue { get { return inst_boolean; } }
-        public double NumberValue { get { return inst_double; } }
+        public decimal NumberValue { get { return inst_double; } }
         public string StringValue { get { return inst_string; } }
     }
 }
diff --git a/csharp/ToolGood.Algorithm2/LitJson/JsonMapper.cs b/csharp/ToolGood.Algorithm2/LitJson/JsonMapper.cs
@@ -19,7 +19,7 @@ private static IJsonWrapper ReadValue(JsonReader reader)
             }
 
             if (reader.Token == JsonToken.Double) {
-                instance.SetDouble((double)reader.Value);
+                instance.SetDouble((decimal)reader.Value);
                 return instance;
             }
 
diff --git a/csharp/ToolGood.Algorithm2/LitJson/JsonReader.cs b/csharp/ToolGood.Algorithm2/LitJson/JsonReader.cs
@@ -150,21 +150,21 @@ private static void TableAddRow(IDictionary<int, IDictionary<int, int[]>> parse_
         private void ProcessNumber(string number)
         {
             if (number.IndexOf('.') != -1 || number.IndexOf('e') != -1 || number.IndexOf('E') != -1) {
-                if (double.TryParse(number, NumberStyles.Any, CultureInfo.InvariantCulture, out double n_double)) {
+                if (decimal.TryParse(number, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal n_double)) {
                     token_value = n_double;
                     return;
                 }
             }
             if (int.TryParse(number, NumberStyles.Integer, CultureInfo.InvariantCulture, out int n_int32)) {
-                token_value = (double)n_int32;
+                token_value = (decimal)n_int32;
                 return;
             }
             if (long.TryParse(number, NumberStyles.Integer, CultureInfo.InvariantCulture, out long n_int64)) {
-                token_value = (double)n_int64;
+                token_value = (decimal)n_int64;
                 return;
             }
             if (ulong.TryParse(number, NumberStyles.Integer, CultureInfo.InvariantCulture, out ulong n_uint64)) {
-                token_value = (double)n_uint64;
+                token_value = (decimal)n_uint64;
                 return;
             }
             // Shouldn't happen, but just in case, return something
diff --git a/csharp/ToolGood.Algorithm2/MyDate.cs b/csharp/ToolGood.Algorithm2/MyDate.cs
@@ -83,7 +83,7 @@ public MyDate(TimeSpan dt)
         /// 构造函数
         /// </summary>
         /// <param name="num"></param>
-        public MyDate(double num)
+        public MyDate(decimal num)
         {
             int days = (int)num;
             if (days > 365) {
@@ -96,10 +96,10 @@ public MyDate(double num)
                 Month = null;
                 Day = days;
             }
-            double d = num - days;
+            decimal d = num - days;
             Hour = (int)(d * 24);
-            Minute = (int)((d * 24 - Hour) * 60.0);
-            Second = (int)(((d * 24 - Hour) * 60.0 - Minute) * 60.0);
+            Minute = (int)((d * 24 - Hour) * 60.0m);
+            Second = (int)(((d * 24 - Hour) * 60.0m - Minute) * 60.0m);
         }
         /// <summary>
         /// 字符串转MyDate
@@ -325,27 +325,27 @@ public static implicit operator TimeSpan(MyDate myDate)
             return myDate.ToTimeSpan();
         }
         /// <summary>
-        /// double=>MyDate
+        /// decimal=>MyDate
         /// </summary>
         /// <param name="days"></param>
-        public static implicit operator MyDate(double days)
+        public static implicit operator MyDate(decimal days)
         {
             return new MyDate(days);
         }
         /// <summary>
-        /// MyDate=>double
+        /// MyDate=>decimal
         /// </summary>
         /// <param name="MyDate"></param>
-        public static implicit operator double(MyDate MyDate)
+        public static implicit operator decimal(MyDate MyDate)
         {
             if (MyDate.Year != null && MyDate.Year > 1900) {
                 var dt = new DateTime((MyDate.Year ?? 0), (MyDate.Month ?? 0), (MyDate.Day ?? 0), MyDate.Hour, MyDate.Minute, MyDate.Second);
-                //double days = (double)(dt -  DateTime.MinValue).TotalDays;
-                double days = (double)(dt - new DateTime(1900, 1, 1)).TotalDays + 2;
-                days += (MyDate.Hour + (MyDate.Minute + MyDate.Second / 60.0) / 60) / 24;
+                //decimal days = (decimal)(dt -  DateTime.MinValue).TotalDays;
+                decimal days = (decimal)(dt - new DateTime(1900, 1, 1)).TotalDays + 2;
+                days += (MyDate.Hour + (MyDate.Minute + MyDate.Second / 60.0m) / 60) / 24;
                 return days;
             }
-            return (MyDate.Day ?? 0) + (MyDate.Hour + (MyDate.Minute + MyDate.Second / 60.0) / 60) / 24;
+            return (MyDate.Day ?? 0) + (MyDate.Hour + (MyDate.Minute + MyDate.Second / 60.0m) / 60) / 24;
         }
 
         /// <summary>
@@ -361,7 +361,7 @@ public static implicit operator double(MyDate MyDate)
             } else if (myDate.Year != null && num.Year == null) {
                 return new MyDate(num.ToDateTime().Add(myDate.ToTimeSpan()));
             }
-            return (MyDate)((double)myDate + (double)num);
+            return (MyDate)((decimal)myDate + (decimal)num);
         }
         /// <summary>
         /// 减
@@ -376,57 +376,57 @@ public static implicit operator double(MyDate MyDate)
             } else if (myDate.Year != null && num.Year == null) {
                 return new MyDate(num.ToDateTime().Add(myDate.ToTimeSpan().Negate()));
             }
-            return (MyDate)((double)myDate - (double)num);
+            return (MyDate)((decimal)myDate - (decimal)num);
         }
         /// <summary>加
         /// 
         /// </summary>
         /// <param name="myDate"></param>
         /// <param name="num"></param>
         /// <returns></returns>
-        public static MyDate operator +(MyDate myDate, double num)
+        public static MyDate operator +(MyDate myDate, decimal num)
         {
-            return (MyDate)((double)myDate + (double)num);
+            return (MyDate)((decimal)myDate + (decimal)num);
         }
         /// <summary>
         /// 减
         /// </summary>
         /// <param name="myDate"></param>
         /// <param name="num"></param>
         /// <returns></returns>
-        public static MyDate operator -(MyDate myDate, double num)
+        public static MyDate operator -(MyDate myDate, decimal num)
         {
-            return (MyDate)((double)myDate - (double)num);
+            return (MyDate)((decimal)myDate - (decimal)num);
         }
         /// <summary>
         /// 乘
         /// </summary>
         /// <param name="myDate"></param>
         /// <param name="num"></param>
         /// <returns></returns>
-        public static MyDate operator *(MyDate myDate, double num)
+        public static MyDate operator *(MyDate myDate, decimal num)
         {
 #if NETSTANDARD2_1
             if (myDate.Year != null) {
-                return new MyDate(myDate.ToTimeSpan().Multiply(num));
+                return new MyDate(myDate.ToTimeSpan().Multiply((double)num));
             }
 #endif
-            return (MyDate)((double)myDate * (double)num);
+            return (MyDate)((decimal)myDate * (decimal)num);
         }
         /// <summary>
         /// 除
         /// </summary>
         /// <param name="myDate"></param>
         /// <param name="num"></param>
         /// <returns></returns>
-        public static MyDate operator /(MyDate myDate, double num)
+        public static MyDate operator /(MyDate myDate, decimal num)
         {
 #if NETSTANDARD2_1
             if (myDate.Year != null) {
-                return new MyDate(myDate.ToTimeSpan().Divide(num));
+                return new MyDate(myDate.ToTimeSpan().Divide((double)num));
             }
 #endif
-            return (MyDate)((double)myDate / (double)num);
+            return (MyDate)((decimal)myDate / (decimal)num);
         }
         #endregion
     }
diff --git a/csharp/ToolGood.Algorithm2/Operand.cs b/csharp/ToolGood.Algorithm2/Operand.cs
diff --git a/csharp/ToolGood.Algorithm2/ToolGood.Algorithm2.csproj b/csharp/ToolGood.Algorithm2/ToolGood.Algorithm2.csproj

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public void RADIANS_test()`
`129`	`129`	`{`
`130`	`130`	`AlgorithmEngine engine = new AlgorithmEngine();`
`131`	`131`	`var t = engine.TryEvaluate("RADIANS(180)", 0.0);`
`132`		`- Assert.AreEqual(Math.PI, t);`
	`132`	`+ Assert.AreEqual(Math.PI, t,10);`
`133`	`133`	`}`
`134`	`134`	`[Test]`
`135`	`135`	`public void cos_test()`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected override Operand ExecuteDiyFunction(string funcName, List<Operand> ope`
`39`	`39`	`{`
`40`	`40`	`if (operands.Count == 1)`
`41`	`41`	`{`
`42`		`- var r = operands[0].ToNumber().NumberValue;`
	`42`	`+ var r = (double)operands[0].ToNumber().NumberValue;`
`43`	`43`	`return r * r * Math.PI;`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ public double TryEvaluate(string exp, double def)`
`558`	`558`	`LastError = obj.ErrorMsg;`
`559`	`559`	`return def;`
`560`	`560`	`}`
`561`		`- return obj.NumberValue;`
	`561`	`+ return (double)obj.NumberValue;`
`562`	`562`	`}`
`563`	`563`	`} catch (Exception ex) {`
`564`	`564`	`LastError = ex.Message + "\r\n" + ex.StackTrace;`
Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,7 @@ public double TryEvaluateCategory(string categoryName, double def)`
`626`	`626`	`LastError = obj.ErrorMsg;`
`627`	`627`	`return def;`
`628`	`628`	`}`
`629`		`- return obj.NumberValue;`
	`629`	`+ return (double)obj.NumberValue;`
`630`	`630`	`} catch (Exception ex) {`
`631`	`631`	`LastError = ex.Message + "\r\n" + ex.StackTrace;`
`632`	`632`	`}`
`@@ -927,7 +927,7 @@ public double TryEvaluate(string exp, double def)`
`927`	`927`	`LastError = obj.ErrorMsg;`
`928`	`928`	`return def;`
`929`	`929`	`}`
`930`		`- return obj.NumberValue;`
	`930`	`+ return (double)obj.NumberValue;`
`931`	`931`	`} catch (Exception ex) {`
`932`	`932`	`LastError = ex.Message + "\r\n" + ex.StackTrace;`
`933`	`933`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ private static IJsonWrapper ReadValue(JsonReader reader)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`if (reader.Token == JsonToken.Double) {`
`22`		`- instance.SetDouble((double)reader.Value);`
	`22`	`+ instance.SetDouble((decimal)reader.Value);`
`23`	`23`	`return instance;`
`24`	`24`	`}`
`25`	`25`