Skip to content

Commit 2d57d8d

Browse files
Added Basic Calculations (#31)
Closes #19
1 parent 6b205d4 commit 2d57d8d

1 file changed

Lines changed: 23 additions & 5 deletions

File tree

code/version-3.py

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
Enter 8 for Area of Triangle
1212
Enter 9 for Perimeter of Triangle
1313
Enter 10 for Area of Trapezium
14-
Enter 11 for Addition of two 2x2 Matrixes
14+
Enter 11 for Addition of Two 2x2 Matrixes
15+
Enter 12 for Usual Addition Calculations
16+
Enter 13 for Usual Subtration Calculations
17+
Enter 14 for Usual Multiplication Calculations
18+
Enter 15 for Usual Division Calculcations
1519
>>> """))
1620
except ValueError:
1721
print("You have entered an invalid input. Please try again.")
@@ -84,16 +88,30 @@
8488
X = [[n11,n12],[n21,n22]]
8589
Y = [[m11,m12],[m21,m22]]
8690
result = [[0, 0],[0,0]]
87-
88-
# iterate through rows
91+
# Iterate Through Rows
8992
for i in range(len(X)):
9093
# iterate through columns
9194
for j in range(len(X[0])):
9295
result[i][j] = X[i][j] + Y[i][j]
93-
9496
for r in result:
9597
print(r)
96-
98+
elif cmd in [12, 13, 14, 15]:
99+
if cmd == 12:
100+
num1 = float(input("Enter First Number: "))
101+
num2 = float(input("Enter Second Number: "))
102+
print(num1 + num2)
103+
elif cmd == 13:
104+
num1 = float(input("Enter First Number: "))
105+
num2 = float(input("Enter Second Number: "))
106+
print(num1 - num2)
107+
elif cmd == 14:
108+
num1 = float(input("Enter First Number: "))
109+
num2 = float(input("Enter Second Number: "))
110+
print(num1 * num2)
111+
else:
112+
num1 = float(input("Enter First Number: "))
113+
num2 = float(input("Enter Second Number: "))
114+
print(num1 / num2)
97115
# Invalid Input Statement
98116
else:
99117
print("You have entered in an invalid input. Please try again.")

0 commit comments

Comments
 (0)