BaseLibraries/Matrix
1
0
Fork 0
mirror of https://bitbucket.org/Mattrixwv/matrix.git synced 2025-12-07 07:23:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs found during unit testing

Browse Source
This commit is contained in:
Matthew Ellison
2022-02-08 22:28:42 +00:00
parent f77b6afbb9
commit 367a8acdb2
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/mattrixwv/matrix/IntegerMatrix.java
View File

@@ -1,7 +1,7 @@
//Matrix/src/main/java/com/mattrixwv/IntegerMatrix.java //Matrix/src/main/java/com/mattrixwv/IntegerMatrix.java
//Mattrixwv //Mattrixwv
// Created: 02-01-22 // Created: 02-01-22
//Modified: 02-07-22 //Modified: 02-08-22
package com.mattrixwv.matrix; package com.mattrixwv.matrix;
@@ -167,8 +167,13 @@ public class IntegerMatrix{
return new IntegerMatrix(newRow); return new IntegerMatrix(newRow);
} }
public int getNumRows(){ public int getNumRows(){
if(grid == null){
return 0;
}
else{
return grid.length; return grid.length;
} }
}
public IntegerMatrix getCol(int col){ public IntegerMatrix getCol(int col){
//Make sure the column number is valid //Make sure the column number is valid
if((col < 0) || (grid.length == 0) || (col > grid[0].length)){ if((col < 0) || (grid.length == 0) || (col > grid[0].length)){
@@ -693,7 +698,7 @@ public class IntegerMatrix{
int[][] newGrid = new int[getNumRows()][getNumCols()]; int[][] newGrid = new int[getNumRows()][getNumCols()];
//If the grid is 1x1 return the grid //If the grid is 1x1 return the grid
if(getNumRows() == 1){ if(getNumRows() == 1){
newGrid[0][0] = grid[0][0]; newGrid[0][0] = 1;
} }
//Use the formula to find the cofactor matrix //Use the formula to find the cofactor matrix
else{ else{
@@ -738,7 +743,7 @@ public class IntegerMatrix{
IntegerMatrix rightMatrix = (IntegerMatrix)rightSide; IntegerMatrix rightMatrix = (IntegerMatrix)rightSide;
//Make sure they have the same number of elements //Make sure they have the same number of elements
if(grid.length != rightMatrix.grid.length){ if(getNumRows() != rightMatrix.getNumRows()){
return false; return false;
} }
else if(getNumCols() != rightMatrix.getNumCols()){ else if(getNumCols() != rightMatrix.getNumCols()){
@@ -746,8 +751,8 @@ public class IntegerMatrix{
} }
//Check every element //Check every element
for(int row = 0;row < grid.length;++row){ for(int row = 0;row < getNumRows();++row){
for(int col = 0;col < grid[0].length;++col){ for(int col = 0;col < getNumCols();++col){
if(grid[row][col] != rightMatrix.grid[row][col]){ if(grid[row][col] != rightMatrix.grid[row][col]){
return false; return false;
} }
@@ -773,10 +778,10 @@ public class IntegerMatrix{
@Override @Override
public String toString(){ public String toString(){
StringJoiner matrix = new StringJoiner("\n"); StringJoiner matrix = new StringJoiner("\n");
for(int rowCnt = 0;rowCnt < grid.length;++rowCnt){ for(int rowCnt = 0;rowCnt < getNumRows();++rowCnt){
StringJoiner row = new StringJoiner(",", "[", "]"); 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])); row.add(Integer.toString(grid[rowCnt][colCnt]));
} }