diff --git a/src/main/java/org/la4j/linear/GaussianSolver.java b/src/main/java/org/la4j/linear/GaussianSolver.java index 9d02a8f7..ed90830d 100644 --- a/src/main/java/org/la4j/linear/GaussianSolver.java +++ b/src/main/java/org/la4j/linear/GaussianSolver.java @@ -105,7 +105,7 @@ private Matrix createExtendTriangleMatrix(Matrix matrix) { private Vector retraceGaus(Matrix matrix, Factory factory) { - if (Math.abs(matrix.product()) < Matrices.EPS) { + if (Math.abs(matrix.diagonalProduct()) < Matrices.EPS) { throw new IllegalArgumentException("This system hasn't solution."); } diff --git a/src/main/java/org/la4j/matrix/AbstractMatrix.java b/src/main/java/org/la4j/matrix/AbstractMatrix.java index 739c0c5f..e83f1712 100644 --- a/src/main/java/org/la4j/matrix/AbstractMatrix.java +++ b/src/main/java/org/la4j/matrix/AbstractMatrix.java @@ -229,7 +229,7 @@ public double determinant() { get(0, 0) * get(1, 2) * get(2, 1); } - return decompose(Matrices.CROUT_DECOMPOSITOR)[0].product(); + return decompose(Matrices.CROUT_DECOMPOSITOR)[0].diagonalProduct(); } @Override @@ -544,7 +544,7 @@ public double trace() { } @Override - public double product() { + public double diagonalProduct() { double result = 1; diff --git a/src/main/java/org/la4j/matrix/AbstractSafeMatrix.java b/src/main/java/org/la4j/matrix/AbstractSafeMatrix.java index 88802744..8833ef08 100644 --- a/src/main/java/org/la4j/matrix/AbstractSafeMatrix.java +++ b/src/main/java/org/la4j/matrix/AbstractSafeMatrix.java @@ -217,8 +217,8 @@ public double trace() { } @Override - public double product() { - return self.product(); + public double diagonalProduct() { + return self.diagonalProduct(); } @Override diff --git a/src/main/java/org/la4j/matrix/Matrix.java b/src/main/java/org/la4j/matrix/Matrix.java index ddea8882..bb6bba26 100644 --- a/src/main/java/org/la4j/matrix/Matrix.java +++ b/src/main/java/org/la4j/matrix/Matrix.java @@ -311,7 +311,7 @@ public interface Matrix extends Externalizable { * * @return the product of diagonal elements of this matrix */ - double product(); + double diagonalProduct(); /** * Returns the "determinant" of this matrix. diff --git a/src/test/java/org/la4j/matrix/AbstractMatrixTest.java b/src/test/java/org/la4j/matrix/AbstractMatrixTest.java index 36497940..1d0811be 100644 --- a/src/test/java/org/la4j/matrix/AbstractMatrixTest.java +++ b/src/test/java/org/la4j/matrix/AbstractMatrixTest.java @@ -764,7 +764,7 @@ public void testProduct_3x3() { { 0.0, 0.0, 9.0 } }); - assertTrue(Math.abs(a.product() - 45.0) < Matrices.EPS); + assertTrue(Math.abs(a.diagonalProduct() - 45.0) < Matrices.EPS); } public void testDeterminant_3x3() {