From 367a8acdb20212e7786183840868c9b56cae17f4 Mon Sep 17 00:00:00 2001 From: Matthew Ellison Date: Tue, 8 Feb 2022 22:28:42 +0000 Subject: [PATCH] Fixed bugs found during unit testing --- .../com/mattrixwv/matrix/IntegerMatrix.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/mattrixwv/matrix/IntegerMatrix.java b/src/main/java/com/mattrixwv/matrix/IntegerMatrix.java index 4c370fe..bf25c59 100644 --- a/src/main/java/com/mattrixwv/matrix/IntegerMatrix.java +++ b/src/main/java/com/mattrixwv/matrix/IntegerMatrix.java @@ -1,7 +1,7 @@ //Matrix/src/main/java/com/mattrixwv/IntegerMatrix.java //Mattrixwv // Created: 02-01-22 -//Modified: 02-07-22 +//Modified: 02-08-22 package com.mattrixwv.matrix; @@ -167,7 +167,12 @@ public class IntegerMatrix{ return new IntegerMatrix(newRow); } public int getNumRows(){ - return grid.length; + if(grid == null){ + return 0; + } + else{ + return grid.length; + } } public IntegerMatrix getCol(int col){ //Make sure the column number is valid @@ -693,7 +698,7 @@ public class IntegerMatrix{ int[][] newGrid = new int[getNumRows()][getNumCols()]; //If the grid is 1x1 return the grid if(getNumRows() == 1){ - newGrid[0][0] = grid[0][0]; + newGrid[0][0] = 1; } //Use the formula to find the cofactor matrix else{ @@ -738,7 +743,7 @@ public class IntegerMatrix{ IntegerMatrix rightMatrix = (IntegerMatrix)rightSide; //Make sure they have the same number of elements - if(grid.length != rightMatrix.grid.length){ + if(getNumRows() != rightMatrix.getNumRows()){ return false; } else if(getNumCols() != rightMatrix.getNumCols()){ @@ -746,8 +751,8 @@ public class IntegerMatrix{ } //Check every element - for(int row = 0;row < grid.length;++row){ - for(int col = 0;col < grid[0].length;++col){ + for(int row = 0;row < getNumRows();++row){ + for(int col = 0;col < getNumCols();++col){ if(grid[row][col] != rightMatrix.grid[row][col]){ return false; } @@ -773,10 +778,10 @@ public class IntegerMatrix{ @Override public String toString(){ StringJoiner matrix = new StringJoiner("\n"); - for(int rowCnt = 0;rowCnt < grid.length;++rowCnt){ + for(int rowCnt = 0;rowCnt < getNumRows();++rowCnt){ StringJoiner row = new StringJoiner(",", "[", "]"); - for(int colCnt = 0;colCnt < grid[0].length;++colCnt){ + for(int colCnt = 0;colCnt < getNumCols();++colCnt){ row.add(Integer.toString(grid[rowCnt][colCnt])); }