修改类名

Author: toolgood

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

@@ -14,7 +14,7 @@ public class AlgorithmEngineExTest
         [Test]
         public void Test()
         {
-            MultiConditionCache multiConditionCache = new MultiConditionCache();
+            ConditionCache multiConditionCache = new ConditionCache();
             multiConditionCache.AddFormula("桌面积", "[圆桌]", "[半径]*[半径]*pi()");
             multiConditionCache.AddFormula("桌面积", "[方桌]", "[长]*[宽]");
 
@@ -64,7 +64,26 @@ public void Test()
 
             var p4 = priceAlgorithm.TryEvaluate("出错了", 0.0);
 
-            
+        }
+
+        [Test]
+        public void Test2()
+        {
+            ConditionCache multiConditionCache = new ConditionCache();
+            multiConditionCache.AddCondition("类型", "[方桌]&& [长]<1.3", "1");
+            multiConditionCache.AddCondition("类型", "[方桌]&& [长]<2", "2");
+            multiConditionCache.AddCondition("类型", "[方桌]&& [长]<5", "3");
+            multiConditionCache.AddCondition("类型", "[方桌]&& [长]<7", "4");
+
+            Desk desk = new Desk() {
+                IsRoundTable = false,
+                Length = 3,
+                Width = 1.3,
+                Heigth = 1
+            };
+            PriceAlgorithm priceAlgorithm = new PriceAlgorithm(multiConditionCache, desk);
+            var p1 = priceAlgorithm.QueryRemark("类型");
+            Assert.AreEqual("3", p1);
         }
 
 
@@ -83,7 +102,7 @@ public class Desk
     public class PriceAlgorithm : ToolGood.Algorithm.AlgorithmEngineEx
     {
         private Desk _disk;
-        public PriceAlgorithm(MultiConditionCache multiConditionCache, Desk desk) : base(multiConditionCache)
+        public PriceAlgorithm(ConditionCache multiConditionCache, Desk desk) : base(multiConditionCache)
         {
             _disk = desk;
         }

csharp/ToolGood.Algorithm2/AlgorithmEngineEx.cs

@@ -29,9 +29,9 @@ public class AlgorithmEngineEx
         /// <summary>
         /// 多条件缓存
         /// </summary>
-        public MultiConditionCache MultiConditionCache { get; private set; }
+        public ConditionCache MultiConditionCache { get; private set; }
 
-        public AlgorithmEngineEx(MultiConditionCache multiConditionCache)
+        public AlgorithmEngineEx(ConditionCache multiConditionCache)
         {
             MultiConditionCache = multiConditionCache;
         }
@@ -141,7 +141,7 @@ public string QueryRemark(string categoryName)
                 }
                 return conditionCache.Remark;
             }
-            return null;
+            throw new Exception($"CategoryName [{categoryName}] is missing.");
         }
 
 

…Good.Algorithm2/MultiConditionalCache.cs …rp/ToolGood.Algorithm2/ConditionCache.cscsharp/ToolGood.Algorithm2/MultiConditionalCache.cs renamed to csharp/ToolGood.Algorithm2/ConditionCache.cs csharp/ToolGood.Algorithm2/MultiConditionalCache.cs renamed to csharp/ToolGood.Algorithm2/ConditionCache.cs

@@ -7,11 +7,11 @@
 namespace ToolGood.Algorithm
 {
     /// <summary>
-    /// 多条件缓存
+    /// 条件缓存
     /// </summary>
-    public class MultiConditionCache
+    public class ConditionCache
     {
-        private Dictionary<string, List<ConditionCache>> conditionCaches = new Dictionary<string, List<ConditionCache>>();
+        private Dictionary<string, List<Internals.ConditionCache>> conditionCaches = new Dictionary<string, List<Internals.ConditionCache>>();
         /// <summary>
         /// 最后一个错误
         /// </summary>
@@ -27,7 +27,7 @@ public class MultiConditionCache
         /// <returns></returns>
         public bool AddFormula(string categoryName, string condition, string formula, string remark = null)
         {
-            ConditionCache conditionCache = new ConditionCache() {
+            Internals.ConditionCache conditionCache = new Internals.ConditionCache() {
                 CategoryName = categoryName,
                 Remark = remark,
                 ConditionString = condition,
@@ -46,9 +46,9 @@ public bool AddFormula(string categoryName, string condition, string formula, st
             }
             conditionCache.Formula = formulaProg;
 
-            List<ConditionCache> list;
+            List<Internals.ConditionCache> list;
             if (conditionCaches.TryGetValue(categoryName, out list) == false) {
-                list = new List<ConditionCache>();
+                list = new List<Internals.ConditionCache>();
                 conditionCaches[categoryName] = list;
             }
 
@@ -66,7 +66,7 @@ public bool AddFormula(string categoryName, string condition, string formula, st
         /// <returns></returns>
         public bool AddCondition(string categoryName, string condition, string remark)
         {
-            ConditionCache conditionCache = new ConditionCache() {
+            Internals.ConditionCache conditionCache = new Internals.ConditionCache() {
                 CategoryName = categoryName,
                 Remark = remark,
                 ConditionString = condition,
@@ -78,9 +78,9 @@ public bool AddCondition(string categoryName, string condition, string remark)
                 }
                 conditionCache.Condition = conditionProg;
             }
-            List<ConditionCache> list;
+            List<Internals.ConditionCache> list;
             if (conditionCaches.TryGetValue(categoryName, out list) == false) {
-                list = new List<ConditionCache>();
+                list = new List<Internals.ConditionCache>();
                 conditionCaches[categoryName] = list;
             }
 
@@ -118,11 +118,11 @@ private ProgContext Parse(string exp)
             return null;
         }
 
-        internal List<ConditionCache> GetConditionCaches(string name)
+        internal List<Internals.ConditionCache> GetConditionCaches(string name)
         {
-            List<ConditionCache> result;
+            List<Internals.ConditionCache> result;
             if (conditionCaches.TryGetValue(name, out result) == false) {
-                result = new List<ConditionCache>();
+                result = new List<Internals.ConditionCache>();
             }
             return result;
         }