From c82f9646cd32c558e76265acc03629c32eeacd4b Mon Sep 17 00:00:00 2001
From: "Akins, Greg 76626" <Greg.Akins@broadridge.com>
Date: Wed, 6 Jun 2018 10:47:53 -0400
Subject: [PATCH] #11 - Making method signature public

---
 .../ExpressionEvaluatorTests.cs               | 16 +++++++++++++++
 .../SimpleExpressionEvaluator.Tests.csproj    |  3 +++
 .../ExpressionEvaluator.cs                    | 20 ++++++++++++-------
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/SimpleExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs b/SimpleExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs
index 709dd27..bec7c7b 100644
--- a/SimpleExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs
+++ b/SimpleExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
 using NUnit.Framework;
@@ -125,6 +126,21 @@ public void Can_Pass_Named_Variables()
 
             Assert.That(dynamicEngine.Evaluate("(c+b)*a", a: 6, b: 4.5, c: 2.6), Is.EqualTo((c + b) * a));
         }
+        [Test]
+        public void Can_Pass_A_Dictionary()
+        {
+            dynamic dynamicEngine = new ExpressionEvaluator();
+
+            var a = 6;
+            var b = 4.5m;
+            var c = 2.6m;
+            Dictionary<String, decimal> dict = new Dictionary<string, decimal>();
+            dict.Add("a", a);
+            dict.Add("b", b);
+            dict.Add("c", c); 
+
+            Assert.That(dynamicEngine.Evaluate("(c+b)*a", dict), Is.EqualTo((c + b) * a));
+        }
 
         [Test]
         public void Can_Invoke_Expression_Multiple_Times()
diff --git a/SimpleExpressionEvaluator.Tests/SimpleExpressionEvaluator.Tests.csproj b/SimpleExpressionEvaluator.Tests/SimpleExpressionEvaluator.Tests.csproj
index 0dce56a..c2a89c0 100644
--- a/SimpleExpressionEvaluator.Tests/SimpleExpressionEvaluator.Tests.csproj
+++ b/SimpleExpressionEvaluator.Tests/SimpleExpressionEvaluator.Tests.csproj
@@ -39,6 +39,9 @@
   <ItemGroup>
     <ProjectReference Include="..\SimpleExpressionEvaluator\SimpleExpressionEvaluator.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SimpleExpressionEvaluator/ExpressionEvaluator.cs b/SimpleExpressionEvaluator/ExpressionEvaluator.cs
index d62df05..a0dada5 100644
--- a/SimpleExpressionEvaluator/ExpressionEvaluator.cs
+++ b/SimpleExpressionEvaluator/ExpressionEvaluator.cs
@@ -111,7 +111,19 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
 
             return true;
         }
+        /// <summary>
+        /// Parses and evaluates an expression with a Dictionary of arguments
+        /// </summary>
+        /// <param name="expression">Expression to parse</param>
+        /// <param name="arguments">An Dictionary object containing arguments for the expression
+        ///   The key pairs matching the variable names in the expression</param>
+        /// <returns></returns>
+        public decimal Evaluate(string expression, Dictionary<string, decimal> arguments)
+        {
+            var compiled = Parse(expression);
 
+            return Execute(compiled, arguments, parameters);
+        }
 
         private Func<decimal[], decimal> Parse(string expression)
         {
@@ -220,13 +232,7 @@ private Dictionary<string, decimal> ParseArguments(object argument)
 
             return arguments;
         }
-
-        private decimal Evaluate(string expression, Dictionary<string, decimal> arguments)
-        {
-            var compiled = Parse(expression);
-
-            return Execute(compiled, arguments, parameters);
-        }
+        
 
         private decimal Execute(Func<decimal[], decimal> compiled, Dictionary<string, decimal> arguments, List<string> parameters)
         {