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

create convert2fraction

Browse Source
This commit is contained in:
Lafrite 2014-05-28 18:39:08 +02:00
parent 8294eec62e
commit 900bad53a3
1 changed files with 21 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
pymath/fraction.py
View File

@ -41,10 +41,8 @@ class Fraction(object):
elif gcd_ != 1: elif gcd_ != 1:
n_frac = Fraction(self._num // gcd_ , self._denom // gcd_) n_frac = Fraction(self._num // gcd_ , self._denom // gcd_)
#steps.append("( {reste1} * {gcd} ) / ( {reste2} * {gcd} )".format(reste1 = n_frac._num, reste2 = n_frac._denom, gcd = gcd_))
steps.append([n_frac._num, gcd_, '*', n_frac._denom, gcd_, '*', '/' ]) steps.append([n_frac._num, gcd_, '*', n_frac._denom, gcd_, '*', '/' ])
# Certainement le truc le plus moche que j'ai jamais fait... On ne met que des strings dans steps puis au dernier moment on met une fraction. C'est moche de ma part
steps.append(n_frac) steps.append(n_frac)
return steps return steps
@ -60,14 +58,25 @@ class Fraction(object):
def __float__(self): def __float__(self):
return self._num / self._denom return self._num / self._denom
def __add__(self, other): def convert2fraction(self, other):
""" Convert a number into a fraction
:param other: a number
:returns: the same number but viewed as a fraction
"""
if type(other) == Fraction: if type(other) == Fraction:
#cool #cool
number = other number = other
else: else:
number = Fraction(other) number = Fraction(other)
return number
def __add__(self, other):
number = self.convert2fraction(other)
steps = [] steps = []
if self._denom == number._denom: if self._denom == number._denom:
@ -97,11 +106,7 @@ class Fraction(object):
return steps return steps
def __radd__(self, other): def __radd__(self, other):
if type(other) == Fraction: number = self.convert2fraction(other)
#cool
number = other
else:
number = Fraction(other)
steps = [] steps = []
@ -133,11 +138,7 @@ class Fraction(object):
def __sub__(self, other): def __sub__(self, other):
if type(other) == Fraction: number = self.convert2fraction(other)
#cool
number = other
else:
number = Fraction(other)
steps = [] steps = []
@ -168,11 +169,7 @@ class Fraction(object):
return steps return steps
def __rsub__(self, other): def __rsub__(self, other):
if type(other) == Fraction: number = self.convert2fraction(other)
#cool
number = other
else:
number = Fraction(other)
steps = [] steps = []
@ -206,11 +203,7 @@ class Fraction(object):
return [Fraction(-self._num,self._denom)] return [Fraction(-self._num,self._denom)]
def __mul__(self, other): def __mul__(self, other):
if type(other) == Fraction: number = self.convert2fraction(other)
#cool
number = other
else:
number = Fraction(other)
steps = [] steps = []
@ -226,11 +219,7 @@ class Fraction(object):
return steps return steps
def __rmul__(self, other): def __rmul__(self, other):
if type(other) == Fraction: number = self.convert2fraction(other)
#cool
number = other
else:
number = Fraction(other)
steps = [] steps = []
@ -246,11 +235,7 @@ class Fraction(object):
return steps return steps
def __truediv__(self, other): def __truediv__(self, other):
if type(other) == Fraction: number = self.convert2fraction(other)
#cool
number = other
else:
number = Fraction(other)
steps = [] steps = []
number = Fraction(number._denom, number._num) number = Fraction(number._denom, number._num)
@ -260,11 +245,7 @@ class Fraction(object):
return steps return steps
def __rtruediv__(self, other): def __rtruediv__(self, other):
if type(other) == Fraction: number = self.convert2fraction(other)
#cool
number = other
else:
number = Fraction(other)
steps = [] steps = []
self_inv = Fraction(self._denom, self._num) self_inv = Fraction(self._denom, self._num)
@ -278,10 +259,7 @@ class Fraction(object):
def __eq__(self, other): def __eq__(self, other):
""" == """ """ == """
if type(other) == Fraction: number = self.convert2fraction(other)
number = other
else:
number = Fraction(other)
return self._num * number._denom == self._denom * number._num return self._num * number._denom == self._denom * number._num