Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Fractions/MyFraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 3 additions & 3 deletions Fractions/Test.py
Original file line number Diff line number Diff line change
@@ -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")
Expand Down