mathjson-solver 1.16.0__tar.gz → 1.16.1__tar.gz

{mathjson_solver-1.16.0/src/mathjson_solver.egg-info → mathjson_solver-1.16.1}/PKG-INFO

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

{mathjson_solver-1.16.0 → mathjson_solver-1.16.1}/setup.cfg

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

{mathjson_solver-1.16.0 → mathjson_solver-1.16.1}/setup.py

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

{mathjson_solver-1.16.0 → mathjson_solver-1.16.1}/src/mathjson_solver/__main__.py

@@ -4,8 +4,6 @@ from functools import reduce
 import math
 from copy import deepcopy
 from statistics import median
-import logging
-import traceback
 import datetime
 
 NUMPY_AVAILABLE = False
@@ -344,7 +342,6 @@ def create_mathjson_solver(solver_parameters):
                     s_ = [float(f(x, c)) for x in f(s[1], c) if is_numeric(f(x, c))]
                 else:
                     s_ = [float(f(x, c)) for x in s[1][1:] if is_numeric(f(x, c))]
-                # print(f"{s_} {sum(s_)}/{len(s_)}")
                 try:
                     return sum(s_) / len(s_)
                 except ZeroDivisionError:
@@ -419,12 +416,9 @@ def create_mathjson_solver(solver_parameters):
                             try:
                                 return f(x[1], c)
                             except MathJSONException:
-                                logging.error(
-                                    "MathJSONException: %s", traceback.format_exc()
-                                )
+                                # Branch failed, try next condition
                                 continue
                     except MathJSONException:
-                        logging.error("MathJSONException: %s", traceback.format_exc())
                         return f(s[-1], c)  # return default value (else)
 
                 return f(s[-1], c)
@@ -902,7 +896,6 @@ def create_mathjson_solver(solver_parameters):
                     c[variable_name] = variable_value
                     values.append(f(function_expression, c))
                 h = (end - start) / n
-                # print("values=", values)
                 return h * (0.5 * values[0] + np.sum(values[1:-1]) + 0.5 * values[-1])
 
                 # return total_area
@@ -1021,13 +1014,13 @@ def create_mathjson_solver(solver_parameters):
                 #     return s[0]
                 # except Exception as e:
                 except TypeError as e:
-                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                    raise MathJSONException(e, s, mathjson_construct=s[0]) from e
                 except ValueError as e:
-                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                    raise MathJSONException(e, s, mathjson_construct=s[0]) from e
                 except IndexError as e:
-                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                    raise MathJSONException(e, s, mathjson_construct=s[0]) from e
                 except ZeroDivisionError as e:
-                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                    raise MathJSONException(e, s, mathjson_construct=s[0]) from e
             else:
                 # raise MathJSONException(
                 #     NotImplementedError(f"'{s[0]}' is not supported"), s

{mathjson_solver-1.16.0 → mathjson_solver-1.16.1/src/mathjson_solver.egg-info}/PKG-INFO

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