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
34 changes: 3 additions & 31 deletions MatrixExample.java
Original file line number Diff line number Diff line change
@@ -1,32 +1,6 @@
import java.util.Random;

public class MatrixExample {
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 = generateRandomMatrix(numRows, numCols);
int[][] result = 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; i++) {
System.out.print(result[i][j] + " ");
}
System.out.println();
}

}

public static int[][] multiplyMatrices(int[][] matrix1, int[][] matrix2) {
int rows1 = matrix1.length;
Expand All @@ -39,14 +13,12 @@ public static int[][] multiplyMatrices(int[][] matrix1, int[][] matrix2) {
"Number of columns in the first matrix must be equal to the number of rows in the second matrix.");
}

// Some more issues here too
int[][] result = new int[rows1+1][cols2+1];
int[][] result = new int[rows1][cols2];

// 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 k = 0; k < rows2; k++) {
result[i][j] += matrix1[i][k] * matrix2[k][j];
}
}
}
Expand Down
27 changes: 27 additions & 0 deletions MatrixTester.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
public class MatrixTester {
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();
}
}
}