Fix: Black does its job

This commit is contained in:
2019-10-13 21:01:31 +02:00
parent 02214b0f82
commit d6bb61dc48
14 changed files with 98 additions and 67 deletions

View File

@@ -12,7 +12,13 @@ Expression
"""
from functools import partial
from ..core import AssocialTree, Tree, compute, typing, TypingError
from ..core.random import extract_rdleaf, extract_rv, random_generator, compute_leafs, replace_rdleaf
from ..core.random import (
extract_rdleaf,
extract_rv,
random_generator,
compute_leafs,
replace_rdleaf,
)
from ..core.MO import moify
from .tokens import factory
from .renders import renders
@@ -75,6 +81,7 @@ class Expression(object):
>>> Expression.set_render('txt')
"""
from .tokens.token import Token
Token.set_render(render)
cls.RENDER = render
@@ -485,6 +492,7 @@ def extract_variable(leaf):
except AttributeError:
return None
def replace(leaf, origin, dest):
""" Recursively replace origin to dest in leaf """
try:
@@ -497,6 +505,7 @@ def replace(leaf, origin, dest):
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:

View File

@@ -69,7 +69,7 @@ class Token(object):
else:
raise ValueError(f"Unknow render {self.RENDER}")
#return renders[self.RENDER](self._mo)
# return renders[self.RENDER](self._mo)
@property
def __txt__(self):
@@ -203,7 +203,6 @@ class Token(object):
return self._get_soul() <= self._get_soul(other)
# -----------------------------
# Reglages pour 'vim'
# vim:set autoindent expandtab tabstop=4 shiftwidth=4:

View File

@@ -26,6 +26,7 @@ def moify(token):
except MOError:
return token
@coroutine
def moify_cor(target):
""" Coroutine which try to convert a parsed token into an MO

View File

@@ -101,7 +101,6 @@ class MO(ABC):
raise NotImplementedError
class Atom(MO):
""" Base Math Object with only one component.

View File

@@ -110,6 +110,7 @@ class MOstrPower(Molecule):
'monome2'
"""
return f"monome{self.power}"
def differentiate(self):
""" differentiate a MOstrPower and get a tree
@@ -121,8 +122,10 @@ class MOstrPower(Molecule):
> x^2
"""
if self._power > 2:
return Tree('*', self.power, MOstrPower(self.variable, self._power._value-1))
return Tree('*', self.power, MOstr(self.variable))
return Tree(
"*", self.power, MOstrPower(self.variable, self._power._value - 1)
)
return Tree("*", self.power, MOstr(self.variable))
class MOMonomial(Molecule):

View File

@@ -27,6 +27,7 @@ multiply_doc = """ Multiply MOs
multiply = Dispatcher("multiply", doc=multiply_doc)
def multiply_filter(left, right):
""" Automatic multiply on MO
@@ -56,6 +57,7 @@ def multiply_filter(left, right):
except TypeError:
pass
@multiply.register((MOnumber, MOFraction), MOstr)
@special_case(multiply_filter)
def moscalar_mostr(left, right):
@@ -102,7 +104,7 @@ def moscalar_mostrpower(left, right):
>>> multiply(a, x)
<MOstrPower x^4>
"""
#if left == 1:
# if left == 1:
# return right
return MOMonomial(left, right)