add doctest operator

This commit is contained in:
lafrite 2014-12-03 16:25:02 +01:00
parent ffd2a55b65
commit edae08d3bc

View File

@ -223,8 +223,19 @@ class op(object):
:op: symbole of the op :op: symbole of the op
:arity: the arity :arity: the arity
>>> op.get_op('+')
'+'
>>> mul = op.get_op('*')
>>> mul.tex
'{op1} \\\\times {op2}'
>>> mul.txt
'{op1} * {op2}'
""" """
try:
return getattr(cls, cls._operators[(op, arity)]) return getattr(cls, cls._operators[(op, arity)])
except KeyError:
raise KeyError("{theOp} (arity: {arity}) is not available".format(theOp = op, arity = arity))
@classmethod @classmethod
def can_be_operator(cls, symbole): def can_be_operator(cls, symbole):
@ -235,7 +246,20 @@ class op(object):
@ClassProperty @ClassProperty
@operatorize @operatorize
def add(cls): def add(cls):
""" The operator + """ """ The operator +
>>> add = op.add
>>> add
'+'
>>> add(1, 2)
3
>>> add.__tex__('1','2')
'1 + 2'
>>> add.__txt__('1','2')
'1 + 2'
>>> add.__tex__('1','-2')
'1 + (-2)'
"""
caract = { caract = {
"operator" : "+", \ "operator" : "+", \
"name" : "add",\ "name" : "add",\
@ -251,7 +275,20 @@ class op(object):
@ClassProperty @ClassProperty
@operatorize @operatorize
def sub(self): def sub(self):
""" The operator - """ """ The operator -
>>> sub = op.sub
>>> sub
'-'
>>> sub(1, 2)
-1
>>> sub.__tex__('1','2')
'1 - 2'
>>> sub.__txt__('1','2')
'1 - 2'
>>> sub.__tex__('1','-2')
'1 - (-2)'
"""
caract = { caract = {
"operator" : "-", \ "operator" : "-", \
"name" : "sub",\ "name" : "sub",\
@ -267,7 +304,20 @@ class op(object):
@ClassProperty @ClassProperty
@operatorize @operatorize
def sub1(self): def sub1(self):
""" The operator - """ """ The operator -
>>> sub1 = op.sub1
>>> sub1
'-'
>>> sub1(1)
-1
>>> sub1.__tex__('1')
'- 1'
>>> sub1.__txt__('1')
'- 1'
>>> sub1.__tex__('-1')
'- (-1)'
"""
def add_parenthesis(self, op): def add_parenthesis(self, op):
""" Add parenthesis if necessary """ """ Add parenthesis if necessary """
try: try:
@ -298,7 +348,20 @@ class op(object):
@ClassProperty @ClassProperty
@operatorize @operatorize
def mul(self): def mul(self):
""" The operator * """ """ The operator *
>>> mul = op.mul
>>> mul
'*'
>>> mul(1, 2)
2
>>> mul.__tex__('1','2')
'1 \\times 2'
>>> mul.__txt__('1','2')
'1 * 2'
>>> mul.__tex__('1','-2')
'1 \\times (-2)'
"""
# * can not be display in some cases # * can not be display in some cases
def _render(self, link, *args): def _render(self, link, *args):
@ -331,7 +394,20 @@ class op(object):
@ClassProperty @ClassProperty
@operatorize @operatorize
def div(self): def div(self):
""" The operator / """ """ The operator /
>>> div = op.div
>>> div
'/'
>>> div(1, 2)
< Fraction 1 / 2>
>>> div.__tex__('1','2')
'\\frac{ 1 }{ 2 }'
>>> div.__tex__('1','2')
'\\frac{ -1 }{ 2 }'
>>> div.__txt__('1','2')
'1 / 2'
"""
from .fraction import Fraction from .fraction import Fraction
def _call(self, op1, op2): def _call(self, op1, op2):
if op2 == 1: if op2 == 1:
@ -343,7 +419,7 @@ class op(object):
# Pas besoin de parenthèses en plus pour \frac # Pas besoin de parenthèses en plus pour \frac
replacement = {"op"+str(i+1): op for (i,op) in enumerate(args)} replacement = {"op"+str(i+1): op for (i,op) in enumerate(args)}
ans = self._tex.format(**replacement) ans = self.tex.format(**replacement)
ans = save_mainOp(ans, self) ans = save_mainOp(ans, self)
return ans return ans
@ -352,7 +428,7 @@ class op(object):
"name" : "div",\ "name" : "div",\
"priority" : 4, \ "priority" : 4, \
"arity" : 2, \ "arity" : 2, \
"txt" : "{op1} /^ {op2}",\ "txt" : "{op1} / {op2}",\
"tex" : "\\frac{{ {op1} }}{{ {op2} }}",\ "tex" : "\\frac{{ {op1} }}{{ {op2} }}",\
"_call": _call,\ "_call": _call,\
"__tex__":__tex__,\ "__tex__":__tex__,\
@ -363,7 +439,20 @@ class op(object):
@ClassProperty @ClassProperty
@operatorize @operatorize
def pw(self): def pw(self):
""" The operator ^ """ """ The operator ^
>>> pw = op.pw
>>> pw
'^'
>>> pw(2, 3)
8
>>> pw.__tex__('2','3')
'2^{ 3 }'
>>> pw.__txt__('2','3')
'2 ^ 3'
>>> pw.__txt__('-2','3')
'( -2 ) ^ 3'
"""
def _call(self, op1, op2): def _call(self, op1, op2):
""" Calling this operator performs the rigth calculus """ """ Calling this operator performs the rigth calculus """
return getattr(op1, "__pow__")(op2) return getattr(op1, "__pow__")(op2)