Merge remote-tracking branch 'upstream/master'

Bykiev · Aug 6, 2024 · 9fe410e · 9fe410e
2 parents bcbb05c + c7c4340
commit 9fe410e
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 18 deletions.
diff --git a/src/NCalc.Async/AsyncExpression.cs b/src/NCalc.Async/AsyncExpression.cs
@@ -131,19 +131,24 @@ public AsyncExpression(LogicalExpression logicalExpression, ExpressionOptions op
     {
         var parameterEnumerators = ParametersHelper.GetEnumerators(Parameters, out var size);
 
-        var results = new List<object?>();
-
-        for (int i = 0; i < size; i++)
+        if (size != null)
         {
-            foreach (var kvp in parameterEnumerators)
+            var results = new List<object?>();
+
+            for (int i = 0; i < size; i++)
             {
-                kvp.Value.MoveNext();
-                Parameters[kvp.Key] = kvp.Value.Current;
+                foreach (var kvp in parameterEnumerators)
+                {
+                    kvp.Value.MoveNext();
+                    Parameters[kvp.Key] = kvp.Value.Current;
+                }
+
+                results.Add(await EvaluationService.EvaluateAsync(LogicalExpression!, Context));
             }
 
-            results.Add(await EvaluationService.EvaluateAsync(LogicalExpression!, Context));
+            return results;
         }
 
-        return results;
+        return await EvaluationService.EvaluateAsync(LogicalExpression!, Context);
     }
 }
diff --git a/src/NCalc.Sync/Expression.cs b/src/NCalc.Sync/Expression.cs
@@ -127,23 +127,28 @@ public Expression(LogicalExpression logicalExpression, ExpressionOptions options
         return EvaluationService.Evaluate(LogicalExpression!, Context);
     }
 
-    private List<object?> IterateParameters()
+    private object? IterateParameters()
     {
         var parameterEnumerators = ParametersHelper.GetEnumerators(Parameters, out var size);
 
-        var results = new List<object?>();
-
-        for (int i = 0; i < size; i++)
+        if (size != null)
         {
-            foreach (var kvp in parameterEnumerators)
+            var results = new List<object?>();
+
+            for (int i = 0; i < size; i++)
             {
-                kvp.Value.MoveNext();
-                Parameters[kvp.Key] = kvp.Value.Current;
+                foreach (var kvp in parameterEnumerators)
+                {
+                    kvp.Value.MoveNext();
+                    Parameters[kvp.Key] = kvp.Value.Current;
+                }
+
+                results.Add(EvaluationService.Evaluate(LogicalExpression!, Context));
             }
 
-            results.Add(EvaluationService.Evaluate(LogicalExpression!, Context));
+            return results;
         }
 
-        return results;
+        return EvaluationService.Evaluate(LogicalExpression!, Context);
     }
 }
diff --git a/test/NCalc.Benchmarks/NCalc.Benchmarks.csproj b/test/NCalc.Benchmarks/NCalc.Benchmarks.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/NCalc.Tests/EvaluationTests.cs b/test/NCalc.Tests/EvaluationTests.cs
@@ -209,6 +209,27 @@ public void ShouldEvaluateArrayParameters()
         Assert.Equal(16, result[4]);
     }
 
+    [Fact]
+    public void ShouldEvaluateArrayParametersWithFunctions()
+    {
+        var e = new Expression("Round(x, 2)", ExpressionOptions.IterateParameters)
+        {
+            Parameters =
+            {
+                ["x"] = new [] { 0.51, 1.671, 2.237, 3.568, 4.11 }
+            }
+        };
+
+        var result = (IList<object>)e.Evaluate();
+
+        Assert.NotNull(result);
+        Assert.Equal(0.51, result[0]);
+        Assert.Equal(1.67, result[1]);
+        Assert.Equal(2.24, result[2]);
+        Assert.Equal(3.57, result[3]);
+        Assert.Equal(4.11, result[4]);
+    }
+
     [Fact]
     public void ShouldEvaluateInOperatorWithList()
     {