mathjson-solver 1.12.0__tar.gz → 1.13.0__tar.gz

{mathjson_solver-1.12.0/src/mathjson_solver.egg-info → mathjson_solver-1.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mathjson-solver
-Version: 1.12.0
+Version: 1.13.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis

{mathjson_solver-1.12.0 → mathjson_solver-1.13.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mathjson-solver
-version = 1.12.0
+version = 1.13.0
 author = Martins Mednis
 author_email = mrt@mednis.info
 description = Utilities for MathJSON evaluation

{mathjson_solver-1.12.0 → mathjson_solver-1.13.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="mathjson-solver",
-    version="1.12.0",
+    version="1.13.0",
     author="Martins Mednis",
     author_email="mrt@mednis.info",
     description="Utilities for MathJSON evaluation",

{mathjson_solver-1.12.0 → mathjson_solver-1.13.0}/src/mathjson_solver/__main__.py

@@ -1,5 +1,4 @@
 import numbers
-from types import NoneType
 from typing import Union
 from functools import reduce
 import math
@@ -9,6 +8,8 @@ import logging
 import traceback
 import datetime
 
+NoneType = type(None)
+
 
 class MathJSONException(Exception):
     """Exception for MathJSON processing issues"""
@@ -253,6 +254,20 @@ def create_mathjson_solver(solver_parameters):
                         raise ValueError(
                             "Case of 'Switch' should have exactly two parameters"
                         )
+                    if comparison_safe_converter(
+                        expression
+                    ) == comparison_safe_converter(f(x[0], c)):
+                        return f(x[1], c)
+                else:
+                    return f(s[2], c)
+
+            def StrictSwitch(s):
+                expression = f(s[1], c)
+                for x in s[3:]:
+                    if len(x) != 2:
+                        raise ValueError(
+                            "Case of 'StrictSwitch' should have exactly two parameters"
+                        )
                     if expression == f(x[0], c):
                         return f(x[1], c)
                 else:
@@ -431,6 +446,7 @@ def create_mathjson_solver(solver_parameters):
                 ),
                 "Constants": Constants,
                 "Switch": Switch,
+                "StrictSwitch": StrictSwitch,
                 "If": If,
                 "Multiply": lambda s: reduce(
                     lambda a, b: float(a) * float(b), [f(x, c) for x in s[1:]]

{mathjson_solver-1.12.0 → mathjson_solver-1.13.0/src/mathjson_solver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mathjson-solver
-Version: 1.12.0
+Version: 1.13.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis

{mathjson_solver-1.12.0 → mathjson_solver-1.13.0}/tests/test_with_pytest.py

@@ -132,6 +132,16 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         #     ],
         #     13
         # ),
+
+
+        # The next tests check the type-forgiving nature of Switch.
+        ({"value": 2}, ["Switch", "value", 0, ["1", 11], ["2", 22]], 22),
+        ({"value": "2"}, ["Switch", "value", 0, [1, 11], [2, 22]], 22),
+
+        # The next tests verify that the StrictSwitch is not forgiving.
+        ({"value": 2}, ["StrictSwitch", "value", 0, ["1", 11], ["2", 22]], 0),
+        ({"value": "2"}, ["StrictSwitch", "value", 0, [1, 11], [2, 22]], 0),
+
         ({"color": "red"}, ["Switch", "color", 0, ["blue", 10], ["red", 30]], 30),
         ({"color": "green"}, ["Switch", "color", 0, ["blue", 10], ["red", 30]], 0),
         ({"color": "green"}, ["Switch", "undefined", 0, ["blue", 10], ["red", 30]], 0),