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

debug simplify: issue when sign changes and need to make simplifications

Browse Source
This commit is contained in:
Lafrite 2014-05-28 19:00:23 +02:00
parent 43973a0039
commit 5f16cf7b62
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pymath/fraction.py
View File

@ -33,14 +33,16 @@ class Fraction(object):
if self._denom < 0: if self._denom < 0:
n_frac = Fraction(-self._num, -self._denom) n_frac = Fraction(-self._num, -self._denom)
steps.append(n_frac) steps.append(n_frac)
else:
n_frac = self
gcd_ = gcd(abs(self._num), abs(self._denom)) gcd_ = gcd(abs(n_frac._num), abs(n_frac._denom))
if self._num == self._denom: if n_frac._num == n_frac._denom:
n_frac = Fraction(1,1) n_frac = Fraction(1,1)
steps.append(n_frac) steps.append(n_frac)
elif gcd_ != 1: elif gcd_ != 1:
n_frac = Fraction(self._num // gcd_ , self._denom // gcd_) n_frac = Fraction(n_frac._num // gcd_ , n_frac._denom // gcd_)
steps.append([n_frac._num, gcd_, '*', n_frac._denom, gcd_, '*', '/' ]) steps.append([n_frac._num, gcd_, '*', n_frac._denom, gcd_, '*', '/' ])
steps.append(n_frac) steps.append(n_frac)
@ -60,12 +62,7 @@ class Fraction(object):
return self._num / self._denom return self._num / self._denom
def convert2fraction(self, other): def convert2fraction(self, other):
""" Convert a number into a fraction """ Convert a other 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
@ -148,7 +145,7 @@ class Fraction(object):
return number - self return number - self
def __neg__(self): def __neg__(self):
return [Fraction(-self._num,self._denom)] return Fraction(-self._num,self._denom).simplify()
def __mul__(self, other): def __mul__(self, other):
number = self.convert2fraction(other) number = self.convert2fraction(other)
@ -176,7 +173,7 @@ class Fraction(object):
steps = [] steps = []
number = Fraction(number._denom, number._num) number = Fraction(number._denom, number._num)
steps.append([self, number, "/"]) steps.append([self, number, "*"])
steps += self * number steps += self * number
return steps return steps
@ -251,8 +248,10 @@ if __name__ == '__main__':
for i in (h * t): for i in (h * t):
print(i) print(i)
print("---------") print("---------")
print("-", str(h) )
# TODO: Bug!! |mer. mai 28 18:48:54 CEST 2014 for i in (-h):
print(i)
print("---------")
print(str(h) , "/", str(t)) print(str(h) , "/", str(t))
for i in (h / t): for i in (h / t):
print(i) print(i)