hiro/SecondaryValue
1
0
Fork 0
mirror of https://github.com/vale981/SecondaryValue synced 2025-03-05 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add missing symbol detection

Browse source
This commit is contained in:
Valentin Boettcher 2019-05-13 09:33:47 +02:00
parent 9139ac9289
commit bafb6d44fa
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SecondaryValue/SecondaryValue.py
View file

@ -29,8 +29,8 @@ class SecondaryValue:
self._parsed = sympify(self._expr) if isinstance(self._expr, str) \ self._parsed = sympify(self._expr) if isinstance(self._expr, str) \
else self._expr else self._expr
self._symbols = [symbol.__str__() \ self._symbols = set([symbol.__str__() \
for symbol in self._parsed.free_symbols] for symbol in self._parsed.free_symbols])
self._deps = {name: dependency \ self._deps = {name: dependency \
for name, dependency in dependencies.items() \ for name, dependency in dependencies.items() \
@ -79,6 +79,11 @@ class SecondaryValue:
kwargs, dep_values = self._calc_deps(**kwargs) kwargs, dep_values = self._calc_deps(**kwargs)
# check for missing symbols
if not self._symbols <= set(kwargs.keys()):
return RuntimeError('Missing symbols: ' +
(self._symbols - set(kwargs.keys())).__str__())
# filter out unneeded # filter out unneeded
kwargs = {var: val for var, val in kwargs.items() if var in self._symbols} kwargs = {var: val for var, val in kwargs.items() if var in self._symbols}
@ -137,3 +142,11 @@ class SecondaryValue:
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))
def get_symbols(self):
"""
:returns: The symbols that can be substituted.
:rtype: List
"""
return self._symbols