Fix pretty printing

This commit is contained in:
Valentin Boettcher 2019-05-15 12:18:13 +02:00
parent 36b6f608f7
commit 2d88701eaa
2 changed files with 5 additions and 4 deletions

View file

@ -242,7 +242,7 @@ class SecondaryValue:
return (result, dep_values) if retdeps else result 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 """Calculates the derivatives of the expression for a given
set of variables specified by args. set of variables specified by args.
""" """
@ -251,7 +251,8 @@ class SecondaryValue:
if var not in self._derivatives: if var not in self._derivatives:
self._derivatives[var] = \ self._derivatives[var] = \
sympy.lambdify(self._parsed.free_symbols, 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} return {var: self._derivatives[var] for var in args}
@ -264,7 +265,7 @@ class SecondaryValue:
:returns: sympy expression :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 \ terms = [(sympy.simplify(derivs[var]) * sympy.Dummy('Delta_' + var))**2 \
for var in variables] for var in variables]
return sympy.sqrt(sum(terms)) return sympy.sqrt(sum(terms))

View file

@ -6,7 +6,7 @@ def readme():
return f.read() return f.read()
setup(name='SecondaryValue', setup(name='SecondaryValue',
version='0.1.6', version='0.1.7',
description='A helper to calculate the gaussian error propagation.', description='A helper to calculate the gaussian error propagation.',
long_description=readme(), long_description=readme(),
long_description_content_type='text/markdown', long_description_content_type='text/markdown',