Compare commits
52 Commits
master
...
1a20e6927d
| Author | SHA1 | Date | |
|---|---|---|---|
| 1a20e6927d | |||
| 7649928be8 | |||
| bb43611f67 | |||
| 9dc4d08619 | |||
| 33c4872ff7 | |||
| 76dad93f03 | |||
| 6f7fd416be | |||
| 8d9294afe1 | |||
| 700665c0a5 | |||
| 7e4bfc9ba0 | |||
| cdfd3e47b5 | |||
| 364f16b872 | |||
| cc94f1f50c | |||
| ad6923f8cd | |||
| fadd93b9a6 | |||
| cb8010c7ac | |||
| f12ec38746 | |||
| f8b24472d1 | |||
| 240857a7ad | |||
| 70ec6933ac | |||
| 91779bd945 | |||
| 69e1e43966 | |||
| 16a6c4953d | |||
| 84c71f6b5d | |||
| 2a74722b19 | |||
| 43fd46379c | |||
| 2d296cf1d2 | |||
| 12109156d1 | |||
| 2fad004d6d | |||
| 207dead5d0 | |||
| e24bff23db | |||
| 69c2b3718d | |||
| 9c25142a4b | |||
| 931e55c35e | |||
| aba43c9f19 | |||
| b93f34bc38 | |||
| 204fdf755b | |||
| d75fd4c4cf | |||
| a32b684b6b | |||
| a5f062a151 | |||
| f8e1c7f962 | |||
| 1685c73051 | |||
| 04ac74d17a | |||
| 23ab39f7d4 | |||
| 41385ec561 | |||
| 8389a319f0 | |||
| 6e24756746 | |||
| d45ab560c9 | |||
| fa8beb6bb2 | |||
| b81281d78a | |||
| 071b8caf1d | |||
| 1ed0b9715a |
@@ -44,7 +44,7 @@ class Token(object):
|
|||||||
|
|
||||||
def explain(self):
|
def explain(self):
|
||||||
""" Yield every calculus step which have lead to self
|
""" Yield every calculus step which have lead to self
|
||||||
|
|
||||||
:example:
|
:example:
|
||||||
>>> from mapytex.calculus.API import Expression
|
>>> from mapytex.calculus.API import Expression
|
||||||
>>> e = Expression.from_str("2+3*4")
|
>>> e = Expression.from_str("2+3*4")
|
||||||
@@ -64,25 +64,10 @@ class Token(object):
|
|||||||
yield self
|
yield self
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return f"<{self.__class__.__name__} {self.__txt__}>"
|
return f"<{self.__class__.__name__} {renders['txt'](self._mo)}>"
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
if self.RENDER == "tex":
|
return renders[self.RENDER](self._mo)
|
||||||
return self.__tex__
|
|
||||||
elif self.RENDER == "txt":
|
|
||||||
return self.__txt__
|
|
||||||
else:
|
|
||||||
raise ValueError(f"Unknow render {self.RENDER}")
|
|
||||||
|
|
||||||
# return renders[self.RENDER](self._mo)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def __txt__(self):
|
|
||||||
return self._mo.__txt__
|
|
||||||
|
|
||||||
@property
|
|
||||||
def __tex__(self):
|
|
||||||
return self._mo.__tex__
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def raw(self):
|
def raw(self):
|
||||||
@@ -265,7 +250,6 @@ class Token(object):
|
|||||||
"""
|
"""
|
||||||
return self._operate(other, "^")
|
return self._operate(other, "^")
|
||||||
|
|
||||||
|
|
||||||
def _roperate(self, other, operation):
|
def _roperate(self, other, operation):
|
||||||
""" Make a operation between 2 Tokens """
|
""" Make a operation between 2 Tokens """
|
||||||
from ..expression import Expression
|
from ..expression import Expression
|
||||||
@@ -315,6 +299,7 @@ class Token(object):
|
|||||||
<Linear x - 3>
|
<Linear x - 3>
|
||||||
"""
|
"""
|
||||||
return self._roperate(other, "-")
|
return self._roperate(other, "-")
|
||||||
|
|
||||||
def __rmul__(self, other):
|
def __rmul__(self, other):
|
||||||
""" Multiply 2 Tokens or a Token and a Expression
|
""" Multiply 2 Tokens or a Token and a Expression
|
||||||
|
|
||||||
@@ -342,7 +327,6 @@ class Token(object):
|
|||||||
"""
|
"""
|
||||||
return self._roperate(other, "/")
|
return self._roperate(other, "/")
|
||||||
|
|
||||||
|
|
||||||
def _get_soul(self, other=None):
|
def _get_soul(self, other=None):
|
||||||
""" Get the builtin soul of self or other """
|
""" Get the builtin soul of self or other """
|
||||||
if isinstance(other, Token):
|
if isinstance(other, Token):
|
||||||
|
|||||||
Reference in New Issue
Block a user