fix

Author: toolgood

csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.cs

@@ -540,6 +540,12 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
             var args1 = func1.Evaluate(work, tempParameter); if (args1.IsError) { return args1; }
             var args2 = func2.Evaluate(work, tempParameter); if (args2.IsError) { return args2; }
 
+            if (args1.IsNumber && args2.IsNumber) { //  优化性能
+                if (args1.NumberValue == 1) { return args2; }
+                if (args2.NumberValue == 1) { return args1; }
+                return Operand.Create(args1.NumberValue * args2.NumberValue);
+            }
+
             if (args1.IsText) {
                 if (decimal.TryParse(args1.TextValue, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal d)) {
                     args1 = Operand.Create(d);
@@ -606,6 +612,12 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
             var args1 = func1.Evaluate(work, tempParameter); if (args1.IsError) { return args1; }
             var args2 = func2.Evaluate(work, tempParameter); if (args2.IsError) { return args2; }
 
+            if (args1.IsNumber && args2.IsNumber) { //  优化性能
+                if (args2.NumberValue == 1) { return args1; }
+                if (args2.NumberValue == 0) { return Operand.Error("Div 0 is error!"); }
+                return Operand.Create(args1.NumberValue / args2.NumberValue);
+            }
+
             if (args1.IsText) {
                 if (decimal.TryParse(args1.TextValue, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal d)) {
                     args1 = Operand.Create(d);
@@ -661,6 +673,11 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
             var args1 = func1.Evaluate(work, tempParameter); if (args1.IsError) { return args1; }
             var args2 = func2.Evaluate(work, tempParameter); if (args2.IsError) { return args2; }
 
+            if (args1.IsNumber && args2.IsNumber) { //  优化性能
+                if (args2.NumberValue == 0) { return Operand.Error("Div 0 is error!"); }
+                return Operand.Create(args1.NumberValue % args2.NumberValue);
+            }
+
             if (args1.IsText) {
                 if (decimal.TryParse(args1.TextValue, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal d)) {
                     args1 = Operand.Create(d);
@@ -715,6 +732,12 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
             var args1 = func1.Evaluate(work, tempParameter); if (args1.IsError) { return args1; }
             var args2 = func2.Evaluate(work, tempParameter); if (args2.IsError) { return args2; }
 
+            if (args1.IsNumber && args2.IsNumber) { //  优化性能
+                if (args1.NumberValue == 0) { return args2; }
+                if (args2.NumberValue == 0) { return args1; }
+                return Operand.Create(args1.NumberValue + args2.NumberValue);
+            }
+
             if (args1.IsText) {
                 if (decimal.TryParse(args1.TextValue, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal d)) {
                     args1 = Operand.Create(d);
@@ -780,6 +803,11 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
             var args1 = func1.Evaluate(work, tempParameter); if (args1.IsError) { return args1; }
             var args2 = func2.Evaluate(work, tempParameter); if (args2.IsError) { return args2; }
 
+            if (args1.IsNumber && args2.IsNumber) { //  优化性能
+                if (args2.NumberValue == 0) { return args1; }
+                return Operand.Create(args1.NumberValue - args2.NumberValue);
+            }
+
             if (args1.IsText) {
                 if (decimal.TryParse(args1.TextValue, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal d)) {
                     args1 = Operand.Create(d);

csharp/ToolGood.Algorithm/ToolGood.Algorithm.csproj

@@ -19,7 +19,7 @@
     <Product>ToolGood.Algorithm</Product>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <SignAssembly>true</SignAssembly>
-    <Version>5.0.0.6</Version>
+    <Version>5.0.0.7</Version>
     <AssemblyOriginatorKeyFile>ToolGood.Algorithm.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\ToolGood.Algorithm.xml</DocumentationFile>