lafrite/Mapytex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rearrange folders and use tree2txt inside MO

Browse Source
This commit is contained in:
Bertrand Benjamin 2018-03-10 08:44:01 +03:00
parent d498af2bab
commit d14850c78d
8 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mapytex/calculus/__init__.py
View File

@ -7,7 +7,7 @@
# Distributed under terms of the MIT license.
"""
Abstracts tools for calculs manipulations
Make calculus as a student
"""
__all__ = []

20
mapytex/calculus/core/MO/fraction.py
View File

@ -32,30 +32,20 @@ class MOFraction(MO):
>>> f
<MOFraction - 2 / 3>
"""
value = Tree("/",
base_value = Tree("/",
MO.factory(numerator),
MO.factory(denominator),
)
if negative:
value = Tree("-", None, base_value)
else:
value = base_value
MO.__init__(self, value)
self._numerator = numerator
self._denominator = denominator
self.negative = negative
@property
def __txt__(self):
# TODO: fonctionnement temporaire. Il faudrait utilser un moteur de rendu plus fin. |jeu. mars 8 15:26:49 EAT 2018
try:
numerator = self._numerator.__txt__
except AttributeError:
numerator = str(self._numerator)
try:
denominator = self._denominator.__txt__
except AttributeError:
denominator = str(self._denominator)
return "- "*self.negative + f"{numerator} / {denominator}"
def __add__(self, other):
""" Overload * for MOFraction

22
mapytex/calculus/core/MO/mo.py
View File

@ -6,9 +6,11 @@
#
# Distributed under terms of the MIT license.
from mapytex.calculus.core.coroutine import coroutine, STOOOP
from ..coroutine import coroutine, STOOOP
from ..renders import tree2txt
from decimal import Decimal
__all__ = ["moify", "MO", "MOstr"]
class MOError(Exception):
@ -84,7 +86,10 @@ class MO(object):
@property
def __txt__(self):
return str(self.value)
try:
return tree2txt(self.value)
except AttributeError:
return str(self.value)
def __add__(self, other):
""" Overload + for MOs
@ -144,6 +149,7 @@ class MO(object):
"""
return MO.factory(-self.value)
class MOnumber(MO):
""" Base number math object (int or Decimal) """
@ -194,15 +200,12 @@ class MOstr(MO):
""" Unknown math object like x or n"""
def __init__(self, value, negative=False):
def __init__(self, value):
""" Initiate a string MO
>>> a = MOstr("x")
>>> a
<MOstr x>
>>> a = MOstr("x", negative=True)
>>> a
<MOstr -x>
>>> b = MOstr(a)
>>> b
<MOstr x>
@ -234,13 +237,8 @@ class MOstr(MO):
raise MOError(f"An MOstr should be initiate with a alpha string, got {val}")
MO.__init__(self, value)
self.negative = negative
self.is_scalar = False
@property
def __txt__(self):
return "-"*self.negative + str(self.value)
def __add__(self, other):
raise NotImplemented
@ -268,7 +266,7 @@ class MOstr(MO):
raise NotImplemented
def __neg__(self):
return MO(self.value, not self.negative)
pass
# -----------------------------
# Reglages pour 'vim'

4
mapytex/calculus/core/__init__.py
View File

@ -10,10 +10,6 @@
Abstracts tools for calculs manipulations
"""
__all__ = ["Tree"]
from .tree import Tree
# -----------------------------
# Reglages pour 'vim'

4
mapytex/calculus/core/coroutine.py
View File

@ -22,8 +22,8 @@ def coroutine(func):
return cr
return start
class STOOOP(BaseException): pass
class RESTAAART(BaseException): pass
class STOOOP(Exception): pass
class RESTAAART(Exception): pass

2
mapytex/calculus/core/operator.py
View File

@ -6,6 +6,8 @@
#
# Distributed under terms of the MIT license.
__all__ = ["OperatorError", "OPERATORS", "is_operator"]
class OperatorError(Exception):
pass

20
mapytex/calculus/core/renders/__init__.py Normal file
View File

@ -0,0 +1,20 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
# vim:fenc=utf-8
#
# Copyright © 2017 lafrite <lafrite@Poivre>
#
# Distributed under terms of the MIT license.
"""
Tree renders
"""
__all__ = ["tree2txt"]
from .tree2txt import tree2txt
# -----------------------------
# Reglages pour 'vim'
# vim:set autoindent expandtab tabstop=4 shiftwidth=4:
# cursor: 16 del

26
mapytex/calculus/core/tree2txt.py → mapytex/calculus/core/renders/tree2txt.py
View File

@ -6,15 +6,17 @@
#
# Distributed under terms of the MIT license.
from .operator import OPERATORS
from mapytex.calculus.core.operator import OPERATORS
__all__ = ['tree2txt']
def plus2txt(left, right):
""" + rendering
>>> from .MO import mo
>>> from ..MO import mo
>>> plus2txt(mo.MOnumber(2), mo.MOnumber(3))
'2 + 3'
>>> from .tree import Tree
>>> from ..tree import Tree
>>> t = Tree.from_str("1+2")
>>> plus2txt(t, mo.MOnumber(3))
'1 + 2 + 3'
@ -52,10 +54,10 @@ def plus2txt(left, right):
def minus2txt(left, right):
""" - rendering
>>> from .MO import mo
>>> from ..MO import mo
>>> minus2txt(None, mo.MO(3))
'- 3'
>>> from .tree import Tree
>>> from ..tree import Tree
>>> t = Tree.from_str("1+2")
>>> minus2txt(None, t)
'- (1 + 2)'
@ -77,10 +79,10 @@ def minus2txt(left, right):
def mul2txt(left, right):
""" * rendering
>>> from .MO import mo
>>> from ..MO import mo
>>> mul2txt(mo.MO(2), mo.MO(3))
'2 * 3'
>>> from .tree import Tree
>>> from ..tree import Tree
>>> t = Tree.from_str("1*2")
>>> mul2txt(t, mo.MO(3))
'1 * 2 * 3'
@ -130,10 +132,10 @@ def mul2txt(left, right):
def div2txt(left, right):
""" / rendering
>>> from .MO import mo
>>> from ..MO import mo
>>> div2txt(mo.MO(2), mo.MO(3))
'2 / 3'
>>> from .tree import Tree
>>> from ..tree import Tree
>>> t = Tree.from_str("1/2")
>>> div2txt(t, mo.MO(3))
'1 / 2 / 3'
@ -172,10 +174,10 @@ def div2txt(left, right):
def pow2txt(left, right):
""" ^ rendering
>>> from .MO import mo
>>> from ..MO import mo
>>> pow2txt(mo.MO(2), mo.MO(3))
'2 ^ 3'
>>> from .tree import Tree
>>> from ..tree import Tree
>>> t = Tree.from_str("1^2")
>>> pow2txt(t, mo.MO(3))
'1 ^ 2 ^ 3'
@ -224,7 +226,7 @@ def tree2txt(tree):
It calls __txt__ to render MOs.
>>> from .tree import Tree
>>> from ..tree import Tree
>>> t = Tree.from_str("2+3*4")
>>> tree2txt(t)
'2 + 3 * 4'