fix

Author: toolgood

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

@@ -38,10 +38,7 @@ public override string ToString()
         /// <param name="stringBuilder">The StringBuilder to which the string representation will be appended. Cannot be null.</param>
         /// <param name="addBrackets">true to enclose the string representation in brackets; otherwise, false.</param>
         public abstract void ToString(StringBuilder stringBuilder, bool addBrackets);
-
-
     }
-
 
     internal abstract class Function_1 : FunctionBase
     {
@@ -51,6 +48,13 @@ protected Function_1(FunctionBase func1)
         {
             this.func1 = func1;
         }
+        protected void AddFunction(StringBuilder stringBuilder, string functionName)
+        {
+            stringBuilder.Append(functionName);
+            stringBuilder.Append("(");
+            func1.ToString(stringBuilder, false);
+            stringBuilder.Append(')');
+        }
     }
 
     internal abstract class Function_2 : FunctionBase
@@ -63,8 +67,19 @@ public Function_2(FunctionBase func1, FunctionBase func2)
             this.func1 = func1;
             this.func2 = func2;
         }
-    }
 
+        protected void AddFunction(StringBuilder stringBuilder,string functionName)
+        {
+            stringBuilder.Append(functionName);
+            stringBuilder.Append("(");
+            func1.ToString(stringBuilder, false);
+            if (func2 != null) {
+                stringBuilder.Append(", ");
+                func2.ToString(stringBuilder, false);
+            }
+            stringBuilder.Append(')');
+        }
+    }
 
     internal abstract class Function_3 : FunctionBase
     {
@@ -78,6 +93,21 @@ protected Function_3(FunctionBase func1, FunctionBase func2, FunctionBase func3)
             this.func2 = func2;
             this.func3 = func3;
         }
+        protected void AddFunction(StringBuilder stringBuilder, string functionName)
+        {
+            stringBuilder.Append(functionName);
+            stringBuilder.Append("(");
+            func1.ToString(stringBuilder, false);
+            if (func2 != null) {
+                stringBuilder.Append(", ");
+                func2.ToString(stringBuilder, false);
+                if (func3 != null) {
+                    stringBuilder.Append(", ");
+                    func3.ToString(stringBuilder, false);
+                }
+            }
+            stringBuilder.Append(')');
+        }
     }
 
     internal abstract class Function_4 : FunctionBase
@@ -94,6 +124,25 @@ protected Function_4(FunctionBase func1, FunctionBase func2, FunctionBase func3,
             this.func3 = func3;
             this.func4 = func4;
         }
+        protected void AddFunction(StringBuilder stringBuilder, string functionName)
+        {
+            stringBuilder.Append(functionName);
+            stringBuilder.Append("(");
+            func1.ToString(stringBuilder, false);
+            if (func2 != null) {
+                stringBuilder.Append(", ");
+                func2.ToString(stringBuilder, false);
+                if (func3 != null) {
+                    stringBuilder.Append(", ");
+                    func3.ToString(stringBuilder, false);
+                    if (func4 != null) {
+                        stringBuilder.Append(", ");
+                        func4.ToString(stringBuilder, false);
+                    }
+                }
+            }
+            stringBuilder.Append(')');
+        }
     }
 
     internal abstract class Function_N : FunctionBase
@@ -104,6 +153,19 @@ protected Function_N(FunctionBase[] funcs)
         {
             this.funcs = funcs;
         }
+
+        protected void AddFunction(StringBuilder stringBuilder, string functionName)
+        {
+            stringBuilder.Append(functionName);
+            stringBuilder.Append("(");
+            for (int i = 0; i < funcs.Length; i++) {
+                if (i > 0) {
+                    stringBuilder.Append(", ");
+                }
+                funcs[i].ToString(stringBuilder, false);
+            }
+            stringBuilder.Append(')');
+        }
     }
 
 
@@ -925,14 +987,7 @@ public override Operand Calculate(AlgorithmEngine work)
 
         public override void ToString(StringBuilder stringBuilder, bool addBrackets)
         {
-            stringBuilder.Append("AND(");
-            for (int i = 0; i < funcs.Length; i++) {
-                if (i > 0) {
-                    stringBuilder.Append(", ");
-                }
-                funcs[i].ToString(stringBuilder, false);
-            }
-            stringBuilder.Append(')');
+            AddFunction(stringBuilder, "AND");
         }
     }
 
@@ -955,14 +1010,7 @@ public override Operand Calculate(AlgorithmEngine work)
         }
         public override void ToString(StringBuilder stringBuilder, bool addBrackets)
         {
-            stringBuilder.Append("OR(");
-            for (int i = 0; i < funcs.Length; i++) {
-                if (i > 0) {
-                    stringBuilder.Append(", ");
-                }
-                funcs[i].ToString(stringBuilder, false);
-            }
-            stringBuilder.Append(')');
+            AddFunction(stringBuilder, "OR");
         }
     }
 
@@ -1060,14 +1108,7 @@ public override Operand Calculate(AlgorithmEngine work)
         }
         public override void ToString(StringBuilder stringBuilder, bool addBrackets)
         {
-            stringBuilder.Append("VLOOKUP(");
-            for (int i = 0; i < funcs.Length; i++) {
-                if (i > 0) {
-                    stringBuilder.Append(", ");
-                }
-                funcs[i].ToString(stringBuilder, false);
-            }
-            stringBuilder.Append(')');
+            AddFunction(stringBuilder, "VLOOKUP");
         }
     }