Algorithms/JavaAlgorithms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

insert scalar divide function

Browse Source
This commit is contained in:
JeonSeongBae 2017-11-27 13:43:47 +09:00
parent 6204a2d364
commit 8f78e59555
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Data Structures/Matrix/Matrix.java
View File

@ -35,6 +35,7 @@ public class Matrix {
//test operations (valid) //test operations (valid)
System.out.println("2 * m2:\n" + m2.scale(2)); System.out.println("2 * m2:\n" + m2.scale(2));
System.out.println("m2 / 2:\n" + m2.divide(2));
System.out.println("m2 + m3:\n" + m2.plus(m3)); System.out.println("m2 + m3:\n" + m2.plus(m3));
System.out.println("m2 - m3:\n" + m2.minus(m3)); System.out.println("m2 - m3:\n" + m2.minus(m3));
System.out.println("m2 * m3: \n"+m2.multiply(m3)); System.out.println("m2 * m3: \n"+m2.multiply(m3));
@ -118,6 +119,24 @@ public class Matrix {
return new Matrix(newData); return new Matrix(newData);
} }
/**
* Returns this matrix scaled by a factor. That is, computes sA where s is a
* constant and A is a matrix (this object).
*
* @param scalar : value to scale by
* @return A new matrix scaled by the scalar value
*/
public Matrix divide(int scalar) {
int[][] newData = new int[this.data.length][this.data[0].length];
for (int i = 0; i < this.getRows(); ++i)
for(int j = 0; j < this.getColumns(); ++j)
newData[i][j] = this.data[i][j] / scalar;
return new Matrix(newData);
}
/** /**
* Adds this matrix to another matrix. * Adds this matrix to another matrix.