添加 单元测试

Author: toolgood

csharp/ToolGood.Algorithm2.Test/AlgorithmEngine/AlgorithmEngineTest.cs

@@ -108,6 +108,8 @@ public void Test()
             var t1 = engine.TryEvaluate("-7 < -2 ?1 : 2", 0);
             Assert.AreEqual(t1, 1);
             t1 = engine.TryEvaluate("-7 < -2 ?1 ： 2", 0);
+            Assert.AreEqual(t1, 1);
+
             t1 = engine.TryEvaluate("-7 < -2 ?1 ：2", 0);
             Assert.AreEqual(t1, 1);
             t1 = engine.TryEvaluate("-7 < -2 ？ 1 : 2", 0);
@@ -175,7 +177,6 @@ public void Cylinder_Test()
             Cylinder c = new Cylinder(3, 10);
             var t = c.TryEvaluate("[半径]*[半径]*pi()", 0.0);      //圆底面积
             var t2 = c.TryEvaluate("半径*半径*pi()", 0.0);      //圆底面积
-
             var t3 = c.TryEvaluate("{半径}*{半径}*pi()", 0.0);      //圆底面积
             var t4 = c.TryEvaluate("@半径*@半径*pi()", 0.0);      //圆底面积
             var t5 = c.TryEvaluate("#半径#*#半径#*pi()", 0.0);      //圆底面积

csharp/ToolGood.Algorithm2.Test/AlgorithmEngineEx/AlgorithmEngineExTest.cs

@@ -0,0 +1,116 @@
+using PetaTest;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ToolGood.Algorithm;
+
+namespace ToolGood.Algorithm2.Test.AlgorithmEngineEx
+{
+    [TestFixture]
+    public class AlgorithmEngineExTest
+    {
+        [Test]
+        public void Test()
+        {
+            MultiConditionCache multiConditionCache = new MultiConditionCache();
+            multiConditionCache.AddFormula("桌面积", "[圆桌]", "[半径]*[半径]*pi()");
+            multiConditionCache.AddFormula("桌面积", "[方桌]", "[长]*[宽]");
+
+            multiConditionCache.AddFormula("价格", "[圆桌]&& [半径]<2.5", "[桌面积]*1.3");
+            multiConditionCache.AddFormula("价格", "[圆桌]&& [半径]<5", "[桌面积]*1.5");
+            multiConditionCache.AddFormula("价格", "[圆桌]&& [半径]<7", "[桌面积]*2");
+            multiConditionCache.AddFormula("价格", "", "[桌面积]*2.5");
+
+            multiConditionCache.AddFormula("价格", "[方桌]&& [长]<1.3", "[桌面积]*1.3+[高]*1.1");
+            multiConditionCache.AddFormula("价格", "[方桌]&& [长]<2", "[桌面积]*1.5+[高]*1.1");
+            multiConditionCache.AddFormula("价格", "[方桌]&& [长]<5", "[桌面积]*2+[高]*1.1");
+            multiConditionCache.AddFormula("价格", "[方桌]&& [长]<7", "[桌面积]*2.5");
+
+            multiConditionCache.AddFormula("出错了", "[方桌]&& [长]<11", "[出错]*2.5");
+
+
+            Desk desk = new Desk() {
+                IsRoundTable = true,
+                Radius = 3
+            };
+            PriceAlgorithm priceAlgorithm = new PriceAlgorithm(multiConditionCache, desk);
+            var p1 = priceAlgorithm.TryEvaluate("价格", 0.0);
+            Assert.AreEqual(3 * 3 * Math.PI * 1.5, p1, 0.0001);
+
+            Desk desk2 = new Desk() {
+                IsRoundTable = false,
+                Length = 3,
+                Width = 1.3,
+                Heigth = 1
+            };
+            priceAlgorithm = new PriceAlgorithm(multiConditionCache, desk2);
+            var p2 = priceAlgorithm.TryEvaluate("价格", 0.0);
+            Assert.AreEqual(3 * 1.3 * 2 + 1 * 1.1, p2, 0.0001);
+
+
+            Desk desk3 = new Desk() {
+                IsRoundTable = false,
+                Length = 9,
+                Width = 1.3,
+                Heigth = 1
+            };
+            priceAlgorithm = new PriceAlgorithm(multiConditionCache, desk3);
+            var p3 = priceAlgorithm.TryEvaluate("价格", 0.0);
+            Assert.AreEqual(0, p3, 0.001);
+            Assert.AreEqual("CategoryName [价格] is missing.", priceAlgorithm.LastError);
+
+
+            var p4 = priceAlgorithm.TryEvaluate("出错了", 0.0);
+
+            
+        }
+
+
+
+    }
+
+    public class Desk
+    {
+        public bool IsRoundTable { get; set; }
+        public double Heigth { get; set; }
+        public double Length { get; set; }
+        public double Width { get; set; }
+        public double Radius { get; set; }
+    }
+
+    public class PriceAlgorithm : ToolGood.Algorithm.AlgorithmEngineEx
+    {
+        private Desk _disk;
+        public PriceAlgorithm(MultiConditionCache multiConditionCache, Desk desk) : base(multiConditionCache)
+        {
+            _disk = desk;
+        }
+
+        protected override Operand GetParameter(string parameter)
+        {
+            if (parameter == "长") {
+                return Operand.Create(_disk.Length);
+            }
+            if (parameter == "宽") {
+                return Operand.Create(_disk.Width);
+            }
+            if (parameter == "高") {
+                return Operand.Create(_disk.Heigth);
+            }
+            if (parameter == "半径") {
+                return Operand.Create(_disk.Radius);
+            }
+            if (parameter == "方桌") {
+                return Operand.Create(_disk.IsRoundTable == false);
+            }
+            if (parameter == "圆桌") {
+                return Operand.Create(_disk.IsRoundTable);
+            }
+            return base.GetParameter(parameter);
+        }
+
+    }
+
+}

csharp/ToolGood.Algorithm2/AlgorithmEngineEx.cs

@@ -26,6 +26,9 @@ public class AlgorithmEngineEx
         /// 自定义 函数
         /// </summary>
         public event Func<string, List<Operand>, Operand> DiyFunction;
+        /// <summary>
+        /// 多条件缓存
+        /// </summary>
         public MultiConditionCache MultiConditionCache { get; private set; }
 
         public AlgorithmEngineEx(MultiConditionCache multiConditionCache)
@@ -51,13 +54,13 @@ protected virtual Operand GetParameter(string parameter)
                 if (conditionCache.Condition != null) {
                     var b = Evaluate(conditionCache.Condition);
                     if (b.IsError) {
-                        return Operand.Error($"Parameter [{parameter}] is error.\r\n Condition `{conditionCache.ConditionString}` is error:{b.ErrorMsg}");
+                        return Operand.Error($"Parameter [{parameter}] condition `{conditionCache.ConditionString}` is error.\r\n{b.ErrorMsg}");
                     }
                     if (b.BooleanValue == false) continue;
                 }
                 operand = Evaluate(conditionCache.Formula);
                 if (operand.IsError) {
-                    operand = Operand.Error($"Parameter [{parameter}] is error.\r\n Formula `{conditionCache.FormulaString}` is error:{operand.ErrorMsg}");
+                    operand = Operand.Error($"Parameter [{parameter}] formula `{conditionCache.FormulaString}` is error.\r\n{operand.ErrorMsg}");
                 }
                 _dict[parameter] = operand;
                 return operand;
@@ -91,6 +94,11 @@ public void ClearDiyFunctions()
 
         #endregion
 
+        /// <summary>
+        /// 执行
+        /// </summary>
+        /// <param name="categoryName"></param>
+        /// <returns></returns>
         public Operand Evaluate(string categoryName)
         {
             Operand operand;
@@ -100,13 +108,13 @@ public Operand Evaluate(string categoryName)
                 if (conditionCache.Condition != null) {
                     var b = Evaluate(conditionCache.Condition);
                     if (b.IsError) {
-                        return Operand.Error($"CategoryName [{categoryName}] is error.\r\nCondition `{conditionCache.ConditionString}` is error:{b.ErrorMsg}");
+                        return Operand.Error($"CategoryName [{categoryName}] condition `{conditionCache.ConditionString}` is error.\r\n{b.ErrorMsg}");
                     }
                     if (b.BooleanValue == false) continue;
                 }
                 operand = Evaluate(conditionCache.Formula);
                 if (operand.IsError) {
-                    operand = Operand.Error($"CategoryName [{categoryName}] is error.\r\nFormula `{conditionCache.FormulaString}` is error:{operand.ErrorMsg}");
+                    operand = Operand.Error($"CategoryName [{categoryName}] formula `{conditionCache.FormulaString}` is error.\r\n{operand.ErrorMsg}");
                 }
                 return operand;
             }

csharp/ToolGood.Algorithm2/MultiConditionalCache.cs

@@ -25,7 +25,7 @@ public class MultiConditionCache
         /// <param name="condition">条件</param>
         /// <param name="remark">备注</param>
         /// <returns></returns>
-        public bool AddFormulaCache(string categoryName, string formula, string condition = null, string remark = null)
+        public bool AddFormula(string categoryName, string condition, string formula, string remark = null)
         {
             ConditionCache conditionCache = new ConditionCache() {
                 CategoryName = categoryName,
@@ -64,7 +64,7 @@ public bool AddFormulaCache(string categoryName, string formula, string conditio
         /// <param name="condition"></param>
         /// <param name="remark"></param>
         /// <returns></returns>
-        public bool AddConditionCache(string categoryName, string condition, string remark)
+        public bool AddCondition(string categoryName, string condition, string remark)
         {
             ConditionCache conditionCache = new ConditionCache() {
                 CategoryName = categoryName,