1.3.1.7版本

Author: toolgood

README.md

@@ -18,8 +18,11 @@ ToolGood.Algorithm֧
 ```
 支持常量`pi`,`e`,`true`,`false`。
 
+数字转bool，非零为真
+
 索引默认为`Excel索引`，如果想用c#索引，请设置`UseExcelIndex`为`false`。
 
+
 ## 自定义参数
 ``` csharp
     //定义圆柱信息

ToolGood.Algorithm/AlgorithmEngine.cs

@@ -51,7 +51,11 @@ protected void AddFunction(string funName, Func<List<Operand>, Operand> function
         #endregion
 
         #region Parse
-
+        /// <summary>
+        /// 编译公式，默认
+        /// </summary>
+        /// <param name="exp">公式</param>
+        /// <returns></returns>
         public bool Parse(string exp)
         {
             if (string.IsNullOrEmpty(exp) || exp.Trim() == "" || !this.isMatching(exp)) {
@@ -62,7 +66,13 @@ public bool Parse(string exp)
             m_tokens = parse(exp, out error);
             return true;
         }
-        public bool Parse(string exp ,out string error)
+        /// <summary>
+        /// 编译公式,并输出错误，默认
+        /// </summary>
+        /// <param name="exp">公式</param>
+        /// <param name="error">输出错误</param>
+        /// <returns></returns>
+        public bool Parse(string exp, out string error)
         {
             if (string.IsNullOrEmpty(exp) || exp.Trim() == "" || !this.isMatching(exp)) {
                 error = "exp无效";
@@ -72,18 +82,30 @@ public bool Parse(string exp ,out string error)
             m_tokens = parse(exp, out error);
             return true;
         }
-
+        /// <summary>
+        /// 编译公式
+        /// </summary>
+        /// <param name="name">名称</param>
+        /// <param name="exp">公式</param>
+        /// <returns></returns>
         public bool Parse(string name, string exp)
         {
             if (string.IsNullOrEmpty(exp) || exp.Trim() == "" || !this.isMatching(exp)) {
                 LastError = "exp无效";
                 return false;
             }
             string error;
-            tokenDict[name] = parse(exp,out error);
+            tokenDict[name] = parse(exp, out error);
             LastError = error;
             return true;
         }
+        /// <summary>
+        /// 编译公式,并输出错误
+        /// </summary>
+        /// <param name="name">名称</param>
+        /// <param name="exp">公式</param>
+        /// <param name="error">输出错误</param>
+        /// <returns></returns>
         public bool Parse(string name, string exp, out string error)
         {
             if (string.IsNullOrEmpty(exp) || exp.Trim() == "" || !this.isMatching(exp)) {
@@ -97,7 +119,7 @@ public bool Parse(string name, string exp, out string error)
         }
 
 
-        private Stack<object> parse(string exp,out string error)
+        private Stack<object> parse(string exp, out string error)
         {
             error = null;
             var tmp = parse(exp);
@@ -396,12 +418,16 @@ private List<string> splitText(string exp)
         #endregion
 
         #region GetParameterNames
-
+        /// <summary>
+        /// 获取所有参数名称
+        /// </summary>
+        /// <returns></returns>
         public List<string> GetParameterNames()
         {
             return GetParameterNames(m_tokens);
         }
-        private List<string> GetParameterNames(Stack<object> tokens )
+
+        private List<string> GetParameterNames(Stack<object> tokens)
         {
             List<string> list = new List<string>();
             foreach (var item in tokens) {
@@ -420,19 +446,32 @@ private List<string> GetParameterNames(Stack<object> tokens )
         #endregion
 
         #region Evaluate
+        /// <summary>
+        /// 执行,默认
+        /// </summary>
+        /// <returns></returns>
         public object Evaluate()
         {
-            if (m_tokens.Count == 0) return null;
+            if (m_tokens.Count == 0) {
+                LastError = "请编译公式！";
+                throw new Exception("请编译公式！");
+            }
             return evaluate(m_tokens);
         }
 
+        /// <summary>
+        /// 执行
+        /// </summary>
+        /// <param name="name">名称</param>
+        /// <returns></returns>
         public object Evaluate(string name)
         {
             Stack<object> tokens = null;
             if (tokenDict.TryGetValue(name, out tokens)) {
                 return evaluate(tokens);
             }
-            return null;
+            LastError = "请编译公式！";
+            throw new Exception("请编译公式！");
         }
 
         private object evaluate(Stack<object> tokens)
@@ -559,121 +598,162 @@ private object evaluate(Stack<object> tokens)
         public short TryEvaluate(string exp, short def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is Date) return (short)(double)(Date)obj;
-                return (short)(double)obj;
+                try {
+                    var obj = Evaluate();
+                    if (obj is Date) return (short)(double)(Date)obj;
+                    return (short)(double)obj;
+                } catch (Exception) { }
             }
             return def;
         }
         public int TryEvaluate(string exp, int def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is Date) return (int)(double)(Date)Evaluate();
-                return (int)(double)obj;
+                try {
+                    var obj = Evaluate();
+                    if (obj is Date) return (int)(double)(Date)Evaluate();
+                    return (int)(double)obj;
+                } catch (Exception) { }
             }
             return def;
         }
         public long TryEvaluate(string exp, long def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is Date) return (long)(double)(Date)obj;
-                return (long)(double)obj;
+                try {
+                    var obj = Evaluate();
+                    if (obj is Date) return (long)(double)(Date)obj;
+                    return (long)(double)obj;
+                } catch (Exception) {
+                }
             }
             return def;
         }
 
         public ushort TryEvaluate(string exp, ushort def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is Date) return (ushort)(double)(Date)obj;
-                return (ushort)(double)obj;
+                try {
+                    var obj = Evaluate();
+                    if (obj is Date) return (ushort)(double)(Date)obj;
+                    return (ushort)(double)obj;
+                } catch (Exception) {
+                }
             }
             return def;
         }
         public uint TryEvaluate(string exp, uint def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is Date) return (uint)(double)(Date)obj;
-                return (uint)(double)obj;
+                try {
+                    var obj = Evaluate();
+                    if (obj is Date) return (uint)(double)(Date)obj;
+                    return (uint)(double)obj;
+                } catch (Exception) {
+                }
             }
             return def;
         }
         public ulong TryEvaluate(string exp, ulong def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is Date) return (ulong)(double)(Date)obj;
-                return (ulong)(double)obj;
+                try {
+                    var obj = Evaluate();
+                    if (obj is Date) return (ulong)(double)(Date)obj;
+                    return (ulong)(double)obj;
+                } catch (Exception) {
+                }
             }
             return def;
         }
 
         public float TryEvaluate(string exp, float def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is Date) return (float)(double)(Date)obj;
-                return (float)(double)obj;
+                try {
+                    var obj = Evaluate();
+                    if (obj is Date) return (float)(double)(Date)obj;
+                    return (float)(double)obj;
+                } catch (Exception) {
+                }
             }
             return def;
         }
         public double TryEvaluate(string exp, double def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is Date) return (double)(Date)obj;
-                return (double)obj;
+                try {
+                    var obj = Evaluate();
+                    if (obj is Date) return (double)(Date)obj;
+                    return (double)obj;
+                } catch (Exception) {
+                }
             }
             return def;
         }
 
         public string TryEvaluate(string exp, string def)
         {
             if (Parse(exp)) {
-                return Evaluate().ToString();
+                try {
+                    return Evaluate().ToString();
+                } catch (Exception) {
+                }
             }
             return def;
         }
         public bool TryEvaluate(string exp, bool def)
         {
             if (Parse(exp)) {
-                return (bool)Evaluate();
+                try {
+                    var obj = Evaluate();
+                    if (obj is string) {
+                        return bool.Parse(obj.ToString());
+                    }
+                    if (obj is bool) {
+                        return (bool)obj;
+                    }
+                    if (obj is Date) return def;
+                    return decimal.Parse(obj.ToString()) != 0;
+                } catch (Exception) {
+                }
             }
             return def;
         }
 
         public DateTime TryEvaluate(string exp, DateTime def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is string) {
-                    DateTime dt;
-                    if (DateTime.TryParse(obj.ToString(), out dt)) {
-                        return dt;
+                try {
+                    var obj = Evaluate();
+                    if (obj is string) {
+                        DateTime dt;
+                        if (DateTime.TryParse(obj.ToString(), out dt)) {
+                            return dt;
+                        }
+                        return def;
                     }
-                    return def;
-                }
-                return (DateTime)(Date)Evaluate();
+                    return (DateTime)(Date)Evaluate();
+                } catch (Exception) { }
             }
             return def;
         }
 
         public TimeSpan TryEvaluate(string exp, TimeSpan def)
         {
             if (Parse(exp)) {
-                var obj = Evaluate();
-                if (obj is string) {
-                    TimeSpan dt;
-                    if (TimeSpan.TryParse(obj.ToString(), out dt)) {
-                        return dt;
+                try {
+                    var obj = Evaluate();
+                    if (obj is string) {
+                        TimeSpan dt;
+                        if (TimeSpan.TryParse(obj.ToString(), out dt)) {
+                            return dt;
+                        }
+                        return def;
                     }
-                    return def;
+                    return (TimeSpan)(Date)Evaluate();
+                } catch (Exception) {
                 }
-                return (TimeSpan)(Date)Evaluate();
             }
             return def;
         }

ToolGood.Algorithm/ToolGood.Algorithm.csproj

@@ -23,11 +23,11 @@
     <RootNamespace>ToolGood.Algorithm</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <FileVersion>1.3.1.6</FileVersion>
-    <Version>1.3.1.6</Version>
+    <FileVersion>1.3.1.7</FileVersion>
+    <Version>1.3.1.7</Version>
     <PackageReleaseNotes></PackageReleaseNotes>
     <Product>ToolGood.Algorithm</Product>
-    <AssemblyVersion>1.3.1.6</AssemblyVersion>
+    <AssemblyVersion>1.3.1.7</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">

ToolGood.Algorithm/_base/Operand.cs

@@ -158,9 +158,9 @@ internal bool BooleanValue
             {
                 if (Type == OperandType.NUMBER) {
                     if (Value is double) {
-                        return (double)Value == 1;
+                        return (double)Value != 0;
                     }
-                    return decimal.Parse(Value.ToString()) == 1M;
+                    return decimal.Parse(Value.ToString()) != 0;
                 }
                 return (bool)Value;
             }