Skip to content

Commit 7f6ea74

Browse files
authored
Merge pull request #6 from dhruvsharma78/master
pulling in someone else's work
2 parents a6e7ff9 + aee7d3f commit 7f6ea74

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

matrix/matrix_operation.py

+11-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,19 @@ def scalarMultiply(matrix , n):
1717

1818
def multiply(matrix_a, matrix_b):
1919
matrix_c = []
20-
n = len(matrix_a)
21-
for i in range(n):
20+
num_rows_a = len(matrix_a)
21+
num_cols_a = len(matrix_a[0])
22+
num_rows_b = len(matrix_b)
23+
num_cols_b = len(matrix_b[0])
24+
25+
if num_cols_a != num_rows_b :
26+
raise ValueError('Cannot multiply matrix of dimensions {},{} and {},{}'.format(num_rows_a,num_cols_a,num_rows_b,num_cols_b))
27+
28+
for i in range(num_rows_a):
2229
list_1 = []
23-
for j in range(n):
30+
for j in range(num_cols_b):
2431
val = 0
25-
for k in range(n):
32+
for k in range(num_rows_a):
2633
val = val + matrix_a[i][k] * matrix_b[k][j]
2734
list_1.append(val)
2835
matrix_c.append(list_1)

0 commit comments

Comments
 (0)