diff --git a/MatrixExample.java b/MatrixExample.java index 051e5bc..627ac8d 100644 --- a/MatrixExample.java +++ b/MatrixExample.java @@ -44,9 +44,9 @@ public static int[][] multiplyMatrices(int[][] matrix1, int[][] matrix2) { // Lots of issues with this code, it used to be working perfectly though for (int i = 0; i < rows1; i++) { - for (int j = 0; j < cols2; j++) { - for (int k = 0; k < cols1; k++) { - result[j][k] += matrix1[i][j] * matrix2[k][j]; + for (int j = 0; j < cols1; j++) { + for (int k = 0; k < cols2; k++) { + result[j][k] += matrix1[i][j] * matrix2[j][k]; } } } diff --git a/MatrixExampleTest.java b/MatrixExampleTest.java new file mode 100644 index 0000000..bf89925 --- /dev/null +++ b/MatrixExampleTest.java @@ -0,0 +1,27 @@ +public class MatrixExampleTest { + public static void main(String[] args) { + int[][] matrix = { + { 1, 2, 3, 4, 5, 6 }, + { 4, 5, 6, 3, 7, 2 }, + { 27, 8, 9, 5, 3, 21 }, + { 73, 2, 19, 5, 1, 8 }, + { 47, 9, 9, 5, 0, 22 }, + { 78, 86, 1, 4, 1, 21 }, + { 73, 18, 2, 2, 5, 11 } + }; + + int numRows = 6; + int numCols = 7; + + int[][] matrix2 = MatrixExample.generateRandomMatrix(numRows, numCols); + int[][] result = MatrixExample.multiplyMatrices(matrix, matrix2); + + System.out.println("result length: " + result.length + " x " + result[0].length); + for (int i = 0; i < result.length; i++) { + for (int j = 0; j < result[i].length; j++) { + System.out.print(result[i][j] + " "); + } + System.out.println(); + } + } +}