From dfcc020d5ce9e01d8441cf33bcc28312264aa9e2 Mon Sep 17 00:00:00 2001 From: Vinay Sawal Date: Sat, 10 Oct 2020 21:41:24 -0700 Subject: [PATCH] Added subtraction --- Fractions/MyFraction.py | 7 ++++++- Fractions/Test.py | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Fractions/MyFraction.py b/Fractions/MyFraction.py index 4b05413..9d9d7b5 100644 --- a/Fractions/MyFraction.py +++ b/Fractions/MyFraction.py @@ -13,7 +13,12 @@ def __add__(self, fraction): return answer def __sub__(self, fraction): - answer = "Calculate the answer. The answer will be a fraction" + self.difNum = self.numerator*fraction.denominator - fraction.numerator*self.denominator + if not self.difNum: + self.difDen = 0 + else: + self.difDen = self.denominator*fraction.denominator + answer = MyFraction(self.difNum, self.difDen) return answer def __mul__(self, fraction): diff --git a/Fractions/Test.py b/Fractions/Test.py index 8adc56c..de8e156 100644 --- a/Fractions/Test.py +++ b/Fractions/Test.py @@ -1,14 +1,14 @@ from MyFraction import MyFraction def main(): - fraction1 = MyFraction(1,2) + fraction1 = MyFraction(1,3) fraction2 = MyFraction(1,2) addResult = fraction1 + fraction2 print("Addition result was: " + str(addResult) + ". The correct answer is: 1/1 or 2/2") - #subResult = fraction2 - fraction1 - #print("Subtraction result was: " + subResult + ". The correct answer is: 0/0") + subResult = fraction2 - fraction1 + print("Subtraction result was: " + str(subResult) + ". The correct answer is: 0/0") #multResult = fraction1 * fraction2 #print("Multiplication result was: " + multResult + ". The correct answer is: 1/4")