Merge pull request #69 from Sbozzolo/master

Swap math.pow with self.pow
axiacore · Aug 26, 2021 · 46ae024 · 46ae024
2 parents 12740ff + c6102c3
commit 46ae024
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/py_expression_eval/__init__.py b/py_expression_eval/__init__.py
@@ -239,6 +239,9 @@ def mul(self, a, b):
     def div(self, a, b):
         return a / b
 
+    def pow(self, a, b):
+        return a ** b
+
     def mod(self, a, b):
         return a % b
 
@@ -374,8 +377,8 @@ def __init__(self, string_literal_quotes = ("'", "\"")):
             '*': self.mul,
             '/': self.div,
             '%': self.mod,
-            '^': math.pow,
-            '**': math.pow,
+            '^': self.pow,
+            '**': self.pow,
             ',': self.append,
             '||': self.concat,
             "==": self.equal,

diff --git a/py_expression_eval/tests.py b/py_expression_eval/tests.py
@@ -42,8 +42,8 @@ def test_parser(self):
         self.assertExactEqual(parser.parse('2 * 3').evaluate({}), 6)
         self.assertExactEqual(parser.parse(u'2 \u2219 3').evaluate({}), 6)
         self.assertExactEqual(parser.parse(u'2 \u2022 3').evaluate({}), 6)
-        self.assertExactEqual(parser.parse('2 ^ x').evaluate({'x': 3}), 8.0)
-        self.assertExactEqual(parser.parse('2 ** x').evaluate({'x': 3}), 8.0)
+        self.assertExactEqual(parser.parse('2 ^ x').evaluate({'x': 3}), 8)
+        self.assertExactEqual(parser.parse('2 ** x').evaluate({'x': 3}), 8)
         self.assertExactEqual(parser.parse('-1.E2 ** x + 2.0E2').evaluate({'x': 1}), 100.0)
         self.assertEqual(parser.parse('x < 3').evaluate({'x': 3}), False)
         self.assertEqual(parser.parse('x < 3').evaluate({'x': 2}), True)
@@ -54,14 +54,14 @@ def test_parser(self):
         self.assertExactEqual(parser.parse('2 * x + 1').evaluate({'x': 3}), 7)
         self.assertExactEqual(parser.parse('2 + 3 * x').evaluate({'x': 4}), 14)
         self.assertExactEqual(parser.parse('(2 + 3) * x').evaluate({'x': 4}), 20)
-        self.assertExactEqual(parser.parse('2-3^x').evaluate({'x': 4}), -79.0)
-        self.assertExactEqual(parser.parse('-2-3^x').evaluate({'x': 4}), -83.0)
-        self.assertExactEqual(parser.parse('-3^x').evaluate({'x': 4}), -81.0)
-        self.assertExactEqual(parser.parse('(-3)^x').evaluate({'x': 4}), 81.0)
-        self.assertExactEqual(parser.parse('2-3**x').evaluate({'x': 4}), -79.0)
-        self.assertExactEqual(parser.parse('-2-3**x').evaluate({'x': 4}), -83.0)
-        self.assertExactEqual(parser.parse('-3**x').evaluate({'x': 4}), -81.0)
-        self.assertExactEqual(parser.parse('(-3)**x').evaluate({'x': 4}), 81.0)
+        self.assertExactEqual(parser.parse('2-3.0^x').evaluate({'x': 4}), -79.0)
+        self.assertExactEqual(parser.parse('-2-3.0^x').evaluate({'x': 4}), -83.0)
+        self.assertExactEqual(parser.parse('-3^x').evaluate({'x': 4}), -81)
+        self.assertExactEqual(parser.parse('(-3)^x').evaluate({'x': 4}), 81)
+        self.assertExactEqual(parser.parse('2-3**x').evaluate({'x': 4}), -79)
+        self.assertExactEqual(parser.parse('-2-3**x').evaluate({'x': 4}), -83)
+        self.assertExactEqual(parser.parse('-3.0**x').evaluate({'x': 4}), -81.0)
+        self.assertExactEqual(parser.parse('(-3.0)**x').evaluate({'x': 4}), 81.0)
         self.assertExactEqual(parser.parse('2*x + y').evaluate({'x': 4, 'y': 1}), 9)
         self.assertEqual(parser.parse("x||y").evaluate({'x': 'hello ', 'y': 'world'}), 'hello world')
         self.assertEqual(parser.parse("'x'||'y'").evaluate({}), 'xy')