You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2019/10/28 01:46:02 UTC
[commons-math] 03/08: Use methods defined in "AnyMatrix".
This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-math.git
commit 2e219c32e84331ec9883b661c61c446e1636165c
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sun Oct 27 14:47:52 2019 +0100
Use methods defined in "AnyMatrix".
---
.../commons/math4/linear/AbstractFieldMatrix.java | 52 ++--------------------
.../commons/math4/linear/AbstractRealMatrix.java | 6 +--
.../math4/linear/Array2DRowFieldMatrix.java | 6 +--
.../commons/math4/linear/Array2DRowRealMatrix.java | 6 +--
.../commons/math4/linear/BlockFieldMatrix.java | 12 ++---
.../commons/math4/linear/BlockRealMatrix.java | 12 ++---
6 files changed, 24 insertions(+), 70 deletions(-)
diff --git a/src/main/java/org/apache/commons/math4/linear/AbstractFieldMatrix.java b/src/main/java/org/apache/commons/math4/linear/AbstractFieldMatrix.java
index 55f264b..1b337b5 100644
--- a/src/main/java/org/apache/commons/math4/linear/AbstractFieldMatrix.java
+++ b/src/main/java/org/apache/commons/math4/linear/AbstractFieldMatrix.java
@@ -144,7 +144,7 @@ public abstract class AbstractFieldMatrix<T extends FieldElement<T>>
public FieldMatrix<T> add(FieldMatrix<T> m)
throws MatrixDimensionMismatchException {
// safety check
- checkAdditionCompatible(m);
+ checkAdd(m);
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -163,7 +163,7 @@ public abstract class AbstractFieldMatrix<T extends FieldElement<T>>
public FieldMatrix<T> subtract(final FieldMatrix<T> m)
throws MatrixDimensionMismatchException {
// safety check
- checkSubtractionCompatible(m);
+ checkAdd(m);
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -213,7 +213,7 @@ public abstract class AbstractFieldMatrix<T extends FieldElement<T>>
public FieldMatrix<T> multiply(final FieldMatrix<T> m)
throws DimensionMismatchException {
// safety check
- checkMultiplicationCompatible(m);
+ checkMultiply(m);
final int nRows = getRowDimension();
final int nCols = m.getColumnDimension();
@@ -1111,50 +1111,4 @@ public abstract class AbstractFieldMatrix<T extends FieldElement<T>>
checkColumnIndex(column);
}
}
-
- /**
- * Check if a matrix is addition compatible with the instance.
- *
- * @param m Matrix to check.
- * @throws MatrixDimensionMismatchException if the matrix is not
- * addition-compatible with instance.
- */
- protected void checkAdditionCompatible(final FieldMatrix<T> m)
- throws MatrixDimensionMismatchException {
- if ((getRowDimension() != m.getRowDimension()) ||
- (getColumnDimension() != m.getColumnDimension())) {
- throw new MatrixDimensionMismatchException(m.getRowDimension(), m.getColumnDimension(),
- getRowDimension(), getColumnDimension());
- }
- }
-
- /**
- * Check if a matrix is subtraction compatible with the instance.
- *
- * @param m Matrix to check.
- * @throws MatrixDimensionMismatchException if the matrix is not
- * subtraction-compatible with instance.
- */
- protected void checkSubtractionCompatible(final FieldMatrix<T> m)
- throws MatrixDimensionMismatchException {
- if ((getRowDimension() != m.getRowDimension()) ||
- (getColumnDimension() != m.getColumnDimension())) {
- throw new MatrixDimensionMismatchException(m.getRowDimension(), m.getColumnDimension(),
- getRowDimension(), getColumnDimension());
- }
- }
-
- /**
- * Check if a matrix is multiplication compatible with the instance.
- *
- * @param m Matrix to check.
- * @throws DimensionMismatchException if the matrix is not
- * multiplication-compatible with instance.
- */
- protected void checkMultiplicationCompatible(final FieldMatrix<T> m)
- throws DimensionMismatchException {
- if (getColumnDimension() != m.getRowDimension()) {
- throw new DimensionMismatchException(m.getRowDimension(), getColumnDimension());
- }
- }
}
diff --git a/src/main/java/org/apache/commons/math4/linear/AbstractRealMatrix.java b/src/main/java/org/apache/commons/math4/linear/AbstractRealMatrix.java
index f6539f0..c5d8d7c 100644
--- a/src/main/java/org/apache/commons/math4/linear/AbstractRealMatrix.java
+++ b/src/main/java/org/apache/commons/math4/linear/AbstractRealMatrix.java
@@ -76,7 +76,7 @@ public abstract class AbstractRealMatrix
@Override
public RealMatrix add(RealMatrix m)
throws MatrixDimensionMismatchException {
- MatrixUtils.checkAdditionCompatible(this, m);
+ checkAdd(m);
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -94,7 +94,7 @@ public abstract class AbstractRealMatrix
@Override
public RealMatrix subtract(final RealMatrix m)
throws MatrixDimensionMismatchException {
- MatrixUtils.checkSubtractionCompatible(this, m);
+ checkAdd(m);
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -142,7 +142,7 @@ public abstract class AbstractRealMatrix
@Override
public RealMatrix multiply(final RealMatrix m)
throws DimensionMismatchException {
- MatrixUtils.checkMultiplicationCompatible(this, m);
+ checkMultiply(m);
final int nRows = getRowDimension();
final int nCols = m.getColumnDimension();
diff --git a/src/main/java/org/apache/commons/math4/linear/Array2DRowFieldMatrix.java b/src/main/java/org/apache/commons/math4/linear/Array2DRowFieldMatrix.java
index f49f888..6afaa8a 100644
--- a/src/main/java/org/apache/commons/math4/linear/Array2DRowFieldMatrix.java
+++ b/src/main/java/org/apache/commons/math4/linear/Array2DRowFieldMatrix.java
@@ -228,7 +228,7 @@ public class Array2DRowFieldMatrix<T extends FieldElement<T>>
public Array2DRowFieldMatrix<T> add(final Array2DRowFieldMatrix<T> m)
throws MatrixDimensionMismatchException {
// safety check
- checkAdditionCompatible(m);
+ checkAdd(m);
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -256,7 +256,7 @@ public class Array2DRowFieldMatrix<T extends FieldElement<T>>
public Array2DRowFieldMatrix<T> subtract(final Array2DRowFieldMatrix<T> m)
throws MatrixDimensionMismatchException {
// safety check
- checkSubtractionCompatible(m);
+ checkAdd(m);
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -285,7 +285,7 @@ public class Array2DRowFieldMatrix<T extends FieldElement<T>>
public Array2DRowFieldMatrix<T> multiply(final Array2DRowFieldMatrix<T> m)
throws DimensionMismatchException {
// safety check
- checkMultiplicationCompatible(m);
+ checkMultiply(m);
final int nRows = this.getRowDimension();
final int nCols = m.getColumnDimension();
diff --git a/src/main/java/org/apache/commons/math4/linear/Array2DRowRealMatrix.java b/src/main/java/org/apache/commons/math4/linear/Array2DRowRealMatrix.java
index b9b41e0..85e4929 100644
--- a/src/main/java/org/apache/commons/math4/linear/Array2DRowRealMatrix.java
+++ b/src/main/java/org/apache/commons/math4/linear/Array2DRowRealMatrix.java
@@ -160,7 +160,7 @@ public class Array2DRowRealMatrix extends AbstractRealMatrix implements Serializ
public Array2DRowRealMatrix add(final Array2DRowRealMatrix m)
throws MatrixDimensionMismatchException {
// Safety check.
- MatrixUtils.checkAdditionCompatible(this, m);
+ checkAdd(m);
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -187,7 +187,7 @@ public class Array2DRowRealMatrix extends AbstractRealMatrix implements Serializ
*/
public Array2DRowRealMatrix subtract(final Array2DRowRealMatrix m)
throws MatrixDimensionMismatchException {
- MatrixUtils.checkSubtractionCompatible(this, m);
+ checkAdd(m);
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -214,7 +214,7 @@ public class Array2DRowRealMatrix extends AbstractRealMatrix implements Serializ
*/
public Array2DRowRealMatrix multiply(final Array2DRowRealMatrix m)
throws DimensionMismatchException {
- MatrixUtils.checkMultiplicationCompatible(this, m);
+ checkMultiply(m);
final int nRows = this.getRowDimension();
final int nCols = m.getColumnDimension();
diff --git a/src/main/java/org/apache/commons/math4/linear/BlockFieldMatrix.java b/src/main/java/org/apache/commons/math4/linear/BlockFieldMatrix.java
index 03417a3..dda300a 100644
--- a/src/main/java/org/apache/commons/math4/linear/BlockFieldMatrix.java
+++ b/src/main/java/org/apache/commons/math4/linear/BlockFieldMatrix.java
@@ -321,7 +321,7 @@ public class BlockFieldMatrix<T extends FieldElement<T>> extends AbstractFieldMa
} catch (ClassCastException cce) {
// safety check
- checkAdditionCompatible(m);
+ checkAdd(m);
final BlockFieldMatrix<T> out = new BlockFieldMatrix<>(getField(), rows, columns);
@@ -367,7 +367,7 @@ public class BlockFieldMatrix<T extends FieldElement<T>> extends AbstractFieldMa
throws MatrixDimensionMismatchException {
// safety check
- checkAdditionCompatible(m);
+ checkAdd(m);
final BlockFieldMatrix<T> out = new BlockFieldMatrix<>(getField(), rows, columns);
@@ -393,7 +393,7 @@ public class BlockFieldMatrix<T extends FieldElement<T>> extends AbstractFieldMa
} catch (ClassCastException cce) {
// safety check
- checkSubtractionCompatible(m);
+ checkAdd(m);
final BlockFieldMatrix<T> out = new BlockFieldMatrix<>(getField(), rows, columns);
@@ -437,7 +437,7 @@ public class BlockFieldMatrix<T extends FieldElement<T>> extends AbstractFieldMa
*/
public BlockFieldMatrix<T> subtract(final BlockFieldMatrix<T> m) throws MatrixDimensionMismatchException {
// safety check
- checkSubtractionCompatible(m);
+ checkAdd(m);
final BlockFieldMatrix<T> out = new BlockFieldMatrix<>(getField(), rows, columns);
@@ -498,7 +498,7 @@ public class BlockFieldMatrix<T extends FieldElement<T>> extends AbstractFieldMa
} catch (ClassCastException cce) {
// safety check
- checkMultiplicationCompatible(m);
+ checkMultiply(m);
final BlockFieldMatrix<T> out = new BlockFieldMatrix<>(getField(), rows, m.getColumnDimension());
final T zero = getField().getZero();
@@ -561,7 +561,7 @@ public class BlockFieldMatrix<T extends FieldElement<T>> extends AbstractFieldMa
throws DimensionMismatchException {
// safety check
- checkMultiplicationCompatible(m);
+ checkMultiply(m);
final BlockFieldMatrix<T> out = new BlockFieldMatrix<>(getField(), rows, m.columns);
final T zero = getField().getZero();
diff --git a/src/main/java/org/apache/commons/math4/linear/BlockRealMatrix.java b/src/main/java/org/apache/commons/math4/linear/BlockRealMatrix.java
index 20192ad..1dff0eb 100644
--- a/src/main/java/org/apache/commons/math4/linear/BlockRealMatrix.java
+++ b/src/main/java/org/apache/commons/math4/linear/BlockRealMatrix.java
@@ -304,7 +304,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable
return add((BlockRealMatrix) m);
} catch (ClassCastException cce) {
// safety check
- MatrixUtils.checkAdditionCompatible(this, m);
+ checkAdd(m);
final BlockRealMatrix out = new BlockRealMatrix(rows, columns);
@@ -347,7 +347,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable
public BlockRealMatrix add(final BlockRealMatrix m)
throws MatrixDimensionMismatchException {
// safety check
- MatrixUtils.checkAdditionCompatible(this, m);
+ checkAdd(m);
final BlockRealMatrix out = new BlockRealMatrix(rows, columns);
@@ -372,7 +372,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable
return subtract((BlockRealMatrix) m);
} catch (ClassCastException cce) {
// safety check
- MatrixUtils.checkSubtractionCompatible(this, m);
+ checkAdd(m);
final BlockRealMatrix out = new BlockRealMatrix(rows, columns);
@@ -415,7 +415,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable
public BlockRealMatrix subtract(final BlockRealMatrix m)
throws MatrixDimensionMismatchException {
// safety check
- MatrixUtils.checkSubtractionCompatible(this, m);
+ checkAdd(m);
final BlockRealMatrix out = new BlockRealMatrix(rows, columns);
@@ -475,7 +475,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable
return multiply((BlockRealMatrix) m);
} catch (ClassCastException cce) {
// safety check
- MatrixUtils.checkMultiplicationCompatible(this, m);
+ checkMultiply(m);
final BlockRealMatrix out = new BlockRealMatrix(rows, m.getColumnDimension());
@@ -532,7 +532,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable
public BlockRealMatrix multiply(BlockRealMatrix m)
throws DimensionMismatchException {
// safety check
- MatrixUtils.checkMultiplicationCompatible(this, m);
+ checkMultiply(m);
final BlockRealMatrix out = new BlockRealMatrix(rows, m.columns);