diff --git a/Fractions/MyFraction.py b/Fractions/MyFraction.py index 4b05413..2712c1a 100644 --- a/Fractions/MyFraction.py +++ b/Fractions/MyFraction.py @@ -17,7 +17,9 @@ def __sub__(self, fraction): return answer def __mul__(self, fraction): - answer = "Calculate the answer. The answer will be a fraction" + self.mulNum = self.numerator * fraction.numerator + self.mulDen = self.denominator * fraction.denominator + answer = MyFraction(self.mulNum, self.mulDen) return answer def __truediv__(self, fraction): diff --git a/Fractions/Test.py b/Fractions/Test.py index 8adc56c..85c77f6 100644 --- a/Fractions/Test.py +++ b/Fractions/Test.py @@ -10,8 +10,8 @@ def main(): #subResult = fraction2 - fraction1 #print("Subtraction result was: " + subResult + ". The correct answer is: 0/0") - #multResult = fraction1 * fraction2 - #print("Multiplication result was: " + multResult + ". The correct answer is: 1/4") + multResult = fraction1 * fraction2 + print("Multiplication result was: " + str(multResult) + ". The correct answer is: 1/4") #divResult = fraction1 / fraction2 #print("Division result was: " + divResult + ". The correct answer is: 1/1")