1.1.10版本，修改部分方法

Author: toolgood

README.md

@@ -1,5 +1,6 @@
 ToolGood.Algorithm
 ===================
+ToolGood.Algorithm支持`四则运算`、`Excel函数`，并支持`自定义参数`。
 
 ## 快速上手
 ``` csharp
@@ -10,9 +11,42 @@ ToolGood.Algorithm
     }
     var c = engine.TryEvaluate("2+3", 0);
 ```
+## 自定义参数
+``` csharp
+    //定义圆柱信息
+    public class Cylinder : AlgorithmEngine
+    {
+        private int _radius;
+        private int _height;
+        public Cylinder(int radius, int height)
+        {
+            _radius = radius;
+            _height = height;
+        }
+
+        protected override Operand GetParameter(Operand curOpd)
+        {
+            if (curOpd.Parameter == "[半径]") {
+                return new Operand(OperandType.NUMBER, _radius);
+            }
+            if (curOpd.Parameter == "[直径]") {
+                return new Operand(OperandType.NUMBER, _radius * 2);
+            }
+            if (curOpd.Parameter == "[高]") {
+                return new Operand(OperandType.NUMBER, _height);
+            }
+            return base.GetParameter(curOpd);
+        }
+    }
+    //调用方法
+    Cylinder c = new Cylinder(3, 10);
+    c.TryEvaluate("[半径]*[半径]*pi()", 0.0);      //圆底面积
+    c.TryEvaluate("[直径]*pi()", 0.0);            //圆的长
+    c.TryEvaluate("[半径]*[半径]*pi()*[高]", 0.0); //圆的体积
+```
 
 
-## 类Excel函数
+## Excel函数
 函数：`逻辑函数`、`数学与三角函数`、`文本函数`、`统计函数`、`日期与时间函数`
 
 #### 逻辑函数

ToolGood.Algorithm.Test/AlgorithmEngine/AlgorithmEngineTest_object.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using PetaTest;
+
+namespace ToolGood.Algorithm
+{
+    [TestFixture]
+    class AlgorithmEngineTest_object
+    {
+        [Test]
+        public void Object_test()
+        {
+            Cylinder c = new Cylinder(3, 10);
+            var d = c.TryEvaluate("[半径]*[半径]*pi()", 0.0);
+            Assert.AreEqual(d, Math.PI * 3 * 3);
+            var s = c.TryEvaluate("[直径]*pi()", 0.0);
+            Assert.AreEqual(s, Math.PI * 6);
+            var v = c.TryEvaluate("[半径]*[半径]*pi()*[高]", 0.0);
+            Assert.AreEqual(v, Math.PI * 9 * 10);
+
+        }
+
+    }
+
+
+    public class Cylinder : AlgorithmEngine
+    {
+        private int _radius;
+        private int _height;
+        public Cylinder(int radius, int height)
+        {
+            _radius = radius;
+            _height = height;
+        }
+
+        protected override Operand GetParameter(Operand curOpd)
+        {
+            if (curOpd.Parameter == "[半径]") {
+                return new Operand(OperandType.NUMBER, _radius);
+            }
+            if (curOpd.Parameter == "[直径]") {
+                return new Operand(OperandType.NUMBER, _radius * 2);
+            }
+            if (curOpd.Parameter == "[高]") {
+                return new Operand(OperandType.NUMBER, _height);
+            }
+            return base.GetParameter(curOpd);
+        }
+    }
+}

ToolGood.Algorithm.Test/ToolGood.Algorithm.Test.csproj

@@ -48,6 +48,7 @@
     <Compile Include="AlgorithmEngine\AlgorithmEngineTest_dateTime.cs" />
     <Compile Include="AlgorithmEngine\AlgorithmEngineTest_flow.cs" />
     <Compile Include="AlgorithmEngine\AlgorithmEngineTest_math.cs" />
+    <Compile Include="AlgorithmEngine\AlgorithmEngineTest_object.cs" />
     <Compile Include="AlgorithmEngine\AlgorithmEngineTest_string.cs" />
     <Compile Include="AlgorithmEngine\AlgorithmEngineTest_sum.cs" />
     <Compile Include="PetaTest.cs" />

ToolGood.Algorithm/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.10.0")]
-[assembly: AssemblyFileVersion("1.1.10.0")]
+[assembly: AssemblyVersion("1.1.11.0")]
+[assembly: AssemblyFileVersion("1.1.11.0")]

ToolGood.Algorithm/_base/Operand.cs

@@ -17,22 +17,80 @@ public Operand(OperandType type, object value)
 
             this.Value = value;
         }
+        public Operand(OperandType type, short value)
+        {
+            this.Type = type;
+            this.Value = (double)value;
+        }
         public Operand(OperandType type, int value)
         {
             this.Type = type;
-
             this.Value = (double)value;
         }
+        public Operand(OperandType type, long value)
+        {
+            this.Type = type;
+            this.Value = (double)value;
+        }
+        public Operand(OperandType type, ushort value)
+        {
+            this.Type = type;
+            this.Value = (double)value;
+        }
+        public Operand(OperandType type, uint value)
+        {
+            this.Type = type;
+            this.Value = (double)value;
+        }
+        public Operand(OperandType type, ulong value)
+        {
+            this.Type = type;
+            this.Value = (double)value;
+        }
+        public Operand(OperandType type, float value)
+        {
+            this.Type = type;
+            this.Value = (double)value;
+        }
+        public Operand(OperandType type, double value)
+        {
+            this.Type = type;
+            this.Value = (double)value;
+        }
+        public Operand(OperandType type, DateTime value)
+        {
+            this.Type = type;
+            this.Value = (Date)value;
+        }
+        internal Operand(OperandType type, Date value)
+        {
+            this.Type = type;
+            this.Value = (Date)value;
+        }
+        public Operand(OperandType type, string value)
+        {
+            this.Type = type;
+            this.Value = value;
+        }
+        public Operand(OperandType type, bool value)
+        {
+            this.Type = type;
+            this.Value = value;
+        }
+        public Operand(List<Operand> value)
+        {
+            this.Type = OperandType.ARRARY;
+            this.Value = value;
+        }
 
 
-
-        public Operand(string opd)
+        internal Operand(string opd)
         {
             var lopd = opd.ToLower();
             if (lopd == "pi") {
                 this.Type = OperandType.NUMBER;
                 this.Value = Math.PI;
-            } else if (lopd=="e") {
+            } else if (lopd == "e") {
                 this.Type = OperandType.NUMBER;
                 this.Value = Math.E;
             } else if (lopd == "true") {
@@ -62,6 +120,9 @@ public Operand(string opd)
         #endregion
 
         #region Variable &　Property
+
+
+
         /// <summary>
         /// 操作数类型
         /// </summary>
@@ -70,7 +131,16 @@ public Operand(string opd)
         /// <summary>
         /// 操作数值
         /// </summary>
-        public object Value { get; set; }
+        internal object Value { get; private set; }
+
+        public string Parameter
+        {
+            get
+            {
+                return Value.ToString().TrimEnd();
+            }
+        }
+
         internal double NumberValue
         {
             get