From db7e343d6746ef5a465e6b2ccaee150880fc6ba7 Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Tue, 14 May 2019 16:02:56 +0200 Subject: [PATCH] fix name clash with lambdify by using the parsed expr --- SecondaryValue/SecondaryValue.py | 9 +++++---- setup.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SecondaryValue/SecondaryValue.py b/SecondaryValue/SecondaryValue.py index 8a4251b..33e11f0 100644 --- a/SecondaryValue/SecondaryValue.py +++ b/SecondaryValue/SecondaryValue.py @@ -29,11 +29,12 @@ class SecondaryValue: """ self._expr = expr - self._parsed = sympify(self._expr, _clash) if isinstance(self._expr, str) \ + self._parsed = sympify(self._expr, _clash) \ + if isinstance(self._expr, str) \ else self._expr self._parsed_lambda = sympy.lambdify(self._parsed.free_symbols, - self._expr) + self._parsed, modules=np) self._symbols = {symbol.__str__() \ for symbol in self._parsed.free_symbols} @@ -248,8 +249,8 @@ class SecondaryValue: for var in args: if var not in self._derivatives: self._derivatives[var] = \ - sympy.lambdify(self._parsed.free_symbols - , diff(self._parsed, var)) + sympy.lambdify(self._parsed.free_symbols, + diff(self._parsed, var), modules=np) return {var: self._derivatives[var] for var in args} diff --git a/setup.py b/setup.py index 3d2b5f5..e5c1e65 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ def readme(): return f.read() setup(name='SecondaryValue', - version='0.1.1', + version='0.1.2', description='A helper to calculate the gaussian error propagation.', long_description=readme(), long_description_content_type='text/markdown',