From 2d88701eaa4ca6864b2a0e54754dc4decddca919 Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Wed, 15 May 2019 12:18:13 +0200 Subject: [PATCH] Fix pretty printing --- SecondaryValue/SecondaryValue.py | 7 ++++--- setup.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SecondaryValue/SecondaryValue.py b/SecondaryValue/SecondaryValue.py index 5568818..2a662cd 100644 --- a/SecondaryValue/SecondaryValue.py +++ b/SecondaryValue/SecondaryValue.py @@ -242,7 +242,7 @@ class SecondaryValue: return (result, dep_values) if retdeps else result - def _get_derivatives(self, *args): + def _get_derivatives(self, *args, lambdify=True): """Calculates the derivatives of the expression for a given set of variables specified by args. """ @@ -251,7 +251,8 @@ class SecondaryValue: if var not in self._derivatives: self._derivatives[var] = \ sympy.lambdify(self._parsed.free_symbols, - diff(self._parsed, var), modules=np) + diff(self._parsed, var), modules=np)\ + if lambdify else diff(self._parsed, var) return {var: self._derivatives[var] for var in args} @@ -264,7 +265,7 @@ class SecondaryValue: :returns: sympy expression """ - derivs = self._get_derivatives(*variables) + derivs = self._get_derivatives(*variables, lambdify=False) terms = [(sympy.simplify(derivs[var]) * sympy.Dummy('Delta_' + var))**2 \ for var in variables] return sympy.sqrt(sum(terms)) diff --git a/setup.py b/setup.py index db29c0a..fd8687c 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ def readme(): return f.read() setup(name='SecondaryValue', - version='0.1.6', + version='0.1.7', description='A helper to calculate the gaussian error propagation.', long_description=readme(), long_description_content_type='text/markdown',