diff options
author | Pablo Astigarraga <poteland@gmail.com> | 2010-04-05 20:04:42 (GMT) |
---|---|---|
committer | Pablo Astigarraga <poteland@gmail.com> | 2010-04-05 20:04:42 (GMT) |
commit | d88fb05ca740ef9cbf6634cfad8a717a86e0c195 (patch) | |
tree | b1722f2fe3c72484d4f793b8a42f1b0c6713b62a | |
parent | 808906e9af681573f19ddcc9247b7548ddb1290f (diff) |
fixed minor issue
-rw-r--r-- | fracciones.activity/fractionlogic.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fracciones.activity/fractionlogic.py b/fracciones.activity/fractionlogic.py index 86c5a3c..a340802 100644 --- a/fracciones.activity/fractionlogic.py +++ b/fracciones.activity/fractionlogic.py @@ -10,9 +10,9 @@ DENOMINATOR_MAX = 10 class Fraction(object): - def __init__(self): - self.numerator = None - self.denominator = None + def __init__(self,numerator=None,denominator=None): + self.numerator = numerator + self.denominator = denominator def __eq__(self,other_fraction): if (self.numerator * other_fraction.denominator == self.denominator * other_fraction.numerator) and type(other_fraction) is Fraction: @@ -85,7 +85,7 @@ class FractionLogic(object): def calculate(fraction_1,fraction_2,operator,reduced_output=False): """Calls appropiate method depending on the operator received as an argument""" """Requires 2 fraction objects and a one character string with the operator (+,-,*,/)""" - result = ( ) + result = Fraction() if operator == "+" : result = add(fraction_1,fraction_2) elif operator == "-" : @@ -94,7 +94,7 @@ def calculate(fraction_1,fraction_2,operator,reduced_output=False): result = multiply(fraction_1,fraction_2) elif operator == "/" : result = divide(fraction_1,fraction_2) - if reduced_output = False: + if reduced_output == False: return result else: return reduce(result) @@ -152,7 +152,7 @@ def reduce(fraction): i = 2 return fraction -# the function to calculate the GCD +# Function to calculate the GCD def gcd(num1, num2): if num1 > num2: for i in range(1,num2+1): @@ -172,7 +172,7 @@ def gcd(num1, num2): result = num1*num2/num1 return result -# the function to calculate the LCM +# Function to calculate the LCM def lcm(num1, num2): result = num1*num2/gcd(num1,num2) return result
\ No newline at end of file |