Fix: move __call__ to expressions

This commit is contained in:
2019-07-15 18:37:16 +02:00
parent b3ec098b0b
commit 0c3c20262e
2 changed files with 41 additions and 28 deletions

View File

@@ -11,7 +11,6 @@ Tokens representing polynomials functions
"""
from ..expression import Expression
from functools import partial
from .token import Token
from ...core.MO import MO
from ...core.MO.atoms import moify
@@ -93,14 +92,7 @@ class Polynomial(Token):
12 + 5
17
"""
tree = self._mo.tree
variable = (set(tree.get_leafs(extract_variable)) - {None}).pop()
dest = moify(value)
replace_var = partial(replace, origin=variable, dest=dest)
tree = tree.map_on_leaf(replace_var)
return Expression(tree).simplify()
return Expression(self._mo.tree)(value)
def differentiate(self):
""" Differentiate a polynome
@@ -262,25 +254,6 @@ class Quadratic(Polynomial):
else:
raise NotImplementedError("Todo!")
def extract_variable(leaf):
try:
return leaf.variable
except AttributeError:
return None
def replace(leaf, origin, dest):
""" Recursively replace origin to dest in leaf """
try:
leaf.tree
except AttributeError:
if leaf == origin:
return dest
return leaf
replace_var = partial(replace, origin=origin, dest=dest)
return leaf.tree.map_on_leaf(replace_var)
# -----------------------------
# Reglages pour 'vim'
# vim:set autoindent expandtab tabstop=4 shiftwidth=4: