Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2405A94C3 for ; Fri, 23 Sep 2011 06:33:36 +0000 (UTC) Received: (qmail 18219 invoked by uid 500); 23 Sep 2011 06:33:35 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 17950 invoked by uid 500); 23 Sep 2011 06:33:29 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 17918 invoked by uid 99); 23 Sep 2011 06:33:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Sep 2011 06:33:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Sep 2011 06:33:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 81DE82388A6E for ; Fri, 23 Sep 2011 06:33:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1174537 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math/linear/ main/java/org/apache/commons/math/ode/nonstiff/ test/java/org/apache/commons/math/linear/ Date: Fri, 23 Sep 2011 06:33:00 -0000 To: commits@commons.apache.org From: celestin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110923063300.81DE82388A6E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: celestin Date: Fri Sep 23 06:32:59 2011 New Revision: 1174537 URL: http://svn.apache.org/viewvc?rev=1174537&view=rev Log: Merged FieldLUDecomposition and FieldLUDecompositionImpl (see MATH-662). Added: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecomposition.java - copied, changed from r1173989, commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionTest.java - copied, changed from r1173989, commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionImplTest.java Removed: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionImplTest.java Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUSolverTest.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecomposition.java (from r1173989, commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java) URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecomposition.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecomposition.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java&r1=1173989&r2=1174537&rev=1174537&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecomposition.java Fri Sep 23 06:32:59 2011 @@ -31,24 +31,39 @@ import org.apache.commons.math.exception * m×m.

*

Since {@link FieldElement field elements} do not provide an ordering * operator, the permutation matrix is computed here only in order to avoid - * a zero pivot element, no attempt is done to get the largest pivot element.

+ * a zero pivot element, no attempt is done to get the largest pivot + * element.

+ *

This class is based on the class with similar name from the + * JAMA library.

+ *
    + *
  • a {@link #getP() getP} method has been added,
    • + *
  • the {@code det} method has been renamed as {@link #getDeterminant() + * getDeterminant},
    • + *
  • the {@code getDoublePivot} method has been removed (but the int based + * {@link #getPivot() getPivot} method has been kept),
    • + *
  • the {@code solve} and {@code isNonSingular} methods have been replaced + * by a {@link #getSolver() getSolver} method and the equivalent methods + * provided by the returned {@link DecompositionSolver}.
    • + *
* * @param the type of the field elements + * @see MathWorld + * @see Wikipedia * @version $Id$ - * @since 2.0 + * @since 2.0 (changed to concrete class in 3.0) */ -public class FieldLUDecompositionImpl> implements FieldLUDecomposition { +public class FieldLUDecomposition> { /** Field to which the elements belong. */ private final Field field; /** Entries of LU decomposition. */ - private T lu[][]; + private T[][] lu; - /** Pivot permutation associated with LU decomposition */ + /** Pivot permutation associated with LU decomposition. */ private int[] pivot; - /** Parity of the permutation associated with the LU decomposition */ + /** Parity of the permutation associated with the LU decomposition. */ private boolean even; /** Singularity indicator. */ @@ -68,7 +83,7 @@ public class FieldLUDecompositionImpl matrix) { + public FieldLUDecomposition(FieldMatrix matrix) { if (!matrix.isSquare()) { throw new NonSquareMatrixException(matrix.getRowDimension(), matrix.getColumnDimension()); @@ -150,7 +165,11 @@ public class FieldLUDecompositionImplL is a lower-triangular matrix

+ * @return the L matrix (or null if decomposed matrix is singular) + */ public FieldMatrix getL() { if ((cachedL == null) && !singular) { final int m = pivot.length; @@ -166,7 +185,11 @@ public class FieldLUDecompositionImplU is an upper-triangular matrix

+ * @return the U matrix (or null if decomposed matrix is singular) + */ public FieldMatrix getU() { if ((cachedU == null) && !singular) { final int m = pivot.length; @@ -181,7 +204,15 @@ public class FieldLUDecompositionImplP is a sparse matrix with exactly one element set to 1.0 in + * each row and each column, all other elements being set to 0.0.

+ *

The positions of the 1 elements are given by the {@link #getPivot() + * pivot permutation vector}.

+ * @return the P rows permutation matrix (or null if decomposed matrix is singular) + * @see #getPivot() + */ public FieldMatrix getP() { if ((cachedP == null) && !singular) { final int m = pivot.length; @@ -193,12 +224,19 @@ public class FieldLUDecompositionImpl getSolver() { return new Solver(field, lu, pivot, singular); } @@ -224,7 +265,7 @@ public class FieldLUDecompositionImpl field; /** Entries of LU decomposition. */ - private final T lu[][]; + private final T[][] lu; /** Pivot permutation associated with LU decomposition. */ private final int[] pivot; Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java?rev=1174537&r1=1174536&r2=1174537&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java Fri Sep 23 06:32:59 2011 @@ -26,7 +26,7 @@ import org.apache.commons.math.linear.Ar import org.apache.commons.math.linear.Array2DRowRealMatrix; import org.apache.commons.math.linear.ArrayFieldVector; import org.apache.commons.math.linear.FieldDecompositionSolver; -import org.apache.commons.math.linear.FieldLUDecompositionImpl; +import org.apache.commons.math.linear.FieldLUDecomposition; import org.apache.commons.math.linear.FieldMatrix; import org.apache.commons.math.linear.MatrixUtils; import org.apache.commons.math.linear.QRDecomposition; @@ -154,7 +154,7 @@ public class AdamsNordsieckTransformer { // compute exact coefficients FieldMatrix bigP = buildP(nSteps); FieldDecompositionSolver pSolver = - new FieldLUDecompositionImpl(bigP).getSolver(); + new FieldLUDecomposition(bigP).getSolver(); BigFraction[] u = new BigFraction[nSteps]; Arrays.fill(u, BigFraction.ONE); Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java?rev=1174537&r1=1174536&r2=1174537&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java Fri Sep 23 06:32:59 2011 @@ -434,8 +434,8 @@ public final class BlockFieldMatrixTest @Test public void testTranspose() { FieldMatrix m = new BlockFieldMatrix(testData); - FieldMatrix mIT = new FieldLUDecompositionImpl(m).getSolver().getInverse().transpose(); - FieldMatrix mTI = new FieldLUDecompositionImpl(m.transpose()).getSolver().getInverse(); + FieldMatrix mIT = new FieldLUDecomposition(m).getSolver().getInverse().transpose(); + FieldMatrix mTI = new FieldLUDecomposition(m.transpose()).getSolver().getInverse(); TestUtils.assertEquals(mIT, mTI); m = new BlockFieldMatrix(testData2); FieldMatrix mt = new BlockFieldMatrix(testData2T); @@ -532,7 +532,7 @@ public final class BlockFieldMatrixTest Assert.assertEquals(2, p.getRowDimension()); Assert.assertEquals(2, p.getColumnDimension()); // Invert p - FieldMatrix pInverse = new FieldLUDecompositionImpl(p).getSolver().getInverse(); + FieldMatrix pInverse = new FieldLUDecomposition(p).getSolver().getInverse(); Assert.assertEquals(2, pInverse.getRowDimension()); Assert.assertEquals(2, pInverse.getColumnDimension()); @@ -547,7 +547,7 @@ public final class BlockFieldMatrixTest new Fraction(1), new Fraction(-2), new Fraction(1) }; Fraction[] solution; - solution = new FieldLUDecompositionImpl(coefficients) + solution = new FieldLUDecomposition(coefficients) .getSolver() .solve(new ArrayFieldVector(constants, false)).toArray(); Assert.assertEquals(new Fraction(2).multiply(solution[0]). Copied: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionTest.java (from r1173989, commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionImplTest.java) URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionTest.java?p2=commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionTest.java&p1=commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionImplTest.java&r1=1173989&r2=1174537&rev=1174537&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionImplTest.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionTest.java Fri Sep 23 06:32:59 2011 @@ -24,7 +24,7 @@ import org.apache.commons.math.TestUtils import org.apache.commons.math.fraction.Fraction; import org.apache.commons.math.fraction.FractionField; -public class FieldLUDecompositionImplTest { +public class FieldLUDecompositionTest { private Fraction[][] testData = { { new Fraction(1), new Fraction(2), new Fraction(3)}, { new Fraction(2), new Fraction(5), new Fraction(3)}, @@ -58,7 +58,7 @@ public class FieldLUDecompositionImplTes public void testDimensions() { FieldMatrix matrix = new Array2DRowFieldMatrix(FractionField.getInstance(), testData); - FieldLUDecomposition LU = new FieldLUDecompositionImpl(matrix); + FieldLUDecomposition LU = new FieldLUDecomposition(matrix); Assert.assertEquals(testData.length, LU.getL().getRowDimension()); Assert.assertEquals(testData.length, LU.getL().getColumnDimension()); Assert.assertEquals(testData.length, LU.getU().getRowDimension()); @@ -73,7 +73,7 @@ public class FieldLUDecompositionImplTes public void testNonSquare() { try { // we don't use FractionField.getInstance() for testing purposes - new FieldLUDecompositionImpl(new Array2DRowFieldMatrix(new Fraction[][] { + new FieldLUDecomposition(new Array2DRowFieldMatrix(new Fraction[][] { { Fraction.ZERO, Fraction.ZERO }, { Fraction.ZERO, Fraction.ZERO }, { Fraction.ZERO, Fraction.ZERO } @@ -88,14 +88,14 @@ public class FieldLUDecompositionImplTes @Test public void testPAEqualLU() { FieldMatrix matrix = new Array2DRowFieldMatrix(FractionField.getInstance(), testData); - FieldLUDecomposition lu = new FieldLUDecompositionImpl(matrix); + FieldLUDecomposition lu = new FieldLUDecomposition(matrix); FieldMatrix l = lu.getL(); FieldMatrix u = lu.getU(); FieldMatrix p = lu.getP(); TestUtils.assertEquals(p.multiply(matrix), l.multiply(u)); matrix = new Array2DRowFieldMatrix(FractionField.getInstance(), testDataMinus); - lu = new FieldLUDecompositionImpl(matrix); + lu = new FieldLUDecomposition(matrix); l = lu.getL(); u = lu.getU(); p = lu.getP(); @@ -105,21 +105,21 @@ public class FieldLUDecompositionImplTes for (int i = 0; i < matrix.getRowDimension(); ++i) { matrix.setEntry(i, i, Fraction.ONE); } - lu = new FieldLUDecompositionImpl(matrix); + lu = new FieldLUDecomposition(matrix); l = lu.getL(); u = lu.getU(); p = lu.getP(); TestUtils.assertEquals(p.multiply(matrix), l.multiply(u)); matrix = new Array2DRowFieldMatrix(FractionField.getInstance(), singular); - lu = new FieldLUDecompositionImpl(matrix); + lu = new FieldLUDecomposition(matrix); Assert.assertFalse(lu.getSolver().isNonSingular()); Assert.assertNull(lu.getL()); Assert.assertNull(lu.getU()); Assert.assertNull(lu.getP()); matrix = new Array2DRowFieldMatrix(FractionField.getInstance(), bigSingular); - lu = new FieldLUDecompositionImpl(matrix); + lu = new FieldLUDecomposition(matrix); Assert.assertFalse(lu.getSolver().isNonSingular()); Assert.assertNull(lu.getL()); Assert.assertNull(lu.getU()); @@ -131,7 +131,7 @@ public class FieldLUDecompositionImplTes @Test public void testLLowerTriangular() { FieldMatrix matrix = new Array2DRowFieldMatrix(FractionField.getInstance(), testData); - FieldMatrix l = new FieldLUDecompositionImpl(matrix).getL(); + FieldMatrix l = new FieldLUDecomposition(matrix).getL(); for (int i = 0; i < l.getRowDimension(); i++) { Assert.assertEquals(Fraction.ONE, l.getEntry(i, i)); for (int j = i + 1; j < l.getColumnDimension(); j++) { @@ -144,7 +144,7 @@ public class FieldLUDecompositionImplTes @Test public void testUUpperTriangular() { FieldMatrix matrix = new Array2DRowFieldMatrix(FractionField.getInstance(), testData); - FieldMatrix u = new FieldLUDecompositionImpl(matrix).getU(); + FieldMatrix u = new FieldLUDecomposition(matrix).getU(); for (int i = 0; i < u.getRowDimension(); i++) { for (int j = 0; j < i; j++) { Assert.assertEquals(Fraction.ZERO, u.getEntry(i, j)); @@ -156,7 +156,7 @@ public class FieldLUDecompositionImplTes @Test public void testPPermutation() { FieldMatrix matrix = new Array2DRowFieldMatrix(FractionField.getInstance(), testData); - FieldMatrix p = new FieldLUDecompositionImpl(matrix).getP(); + FieldMatrix p = new FieldLUDecomposition(matrix).getP(); FieldMatrix ppT = p.multiply(p.transpose()); FieldMatrix id = @@ -212,11 +212,11 @@ public class FieldLUDecompositionImplTes @Test public void testSingular() { FieldLUDecomposition lu = - new FieldLUDecompositionImpl(new Array2DRowFieldMatrix(FractionField.getInstance(), testData)); + new FieldLUDecomposition(new Array2DRowFieldMatrix(FractionField.getInstance(), testData)); Assert.assertTrue(lu.getSolver().isNonSingular()); - lu = new FieldLUDecompositionImpl(new Array2DRowFieldMatrix(FractionField.getInstance(), singular)); + lu = new FieldLUDecomposition(new Array2DRowFieldMatrix(FractionField.getInstance(), singular)); Assert.assertFalse(lu.getSolver().isNonSingular()); - lu = new FieldLUDecompositionImpl(new Array2DRowFieldMatrix(FractionField.getInstance(), bigSingular)); + lu = new FieldLUDecomposition(new Array2DRowFieldMatrix(FractionField.getInstance(), bigSingular)); Assert.assertFalse(lu.getSolver().isNonSingular()); } @@ -224,7 +224,7 @@ public class FieldLUDecompositionImplTes @Test public void testMatricesValues1() { FieldLUDecomposition lu = - new FieldLUDecompositionImpl(new Array2DRowFieldMatrix(FractionField.getInstance(), testData)); + new FieldLUDecomposition(new Array2DRowFieldMatrix(FractionField.getInstance(), testData)); FieldMatrix lRef = new Array2DRowFieldMatrix(FractionField.getInstance(), new Fraction[][] { { new Fraction(1), new Fraction(0), new Fraction(0) }, { new Fraction(2), new Fraction(1), new Fraction(0) }, @@ -265,7 +265,7 @@ public class FieldLUDecompositionImplTes @Test public void testMatricesValues2() { FieldLUDecomposition lu = - new FieldLUDecompositionImpl(new Array2DRowFieldMatrix(FractionField.getInstance(), luData)); + new FieldLUDecomposition(new Array2DRowFieldMatrix(FractionField.getInstance(), luData)); FieldMatrix lRef = new Array2DRowFieldMatrix(FractionField.getInstance(), new Fraction[][] { { new Fraction(1), new Fraction(0), new Fraction(0) }, { new Fraction(3), new Fraction(1), new Fraction(0) }, Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUSolverTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUSolverTest.java?rev=1174537&r1=1174536&r2=1174537&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUSolverTest.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUSolverTest.java Fri Sep 23 06:32:59 2011 @@ -65,13 +65,13 @@ public class FieldLUSolverTest { @Test public void testSingular() { FieldDecompositionSolver solver; - solver = new FieldLUDecompositionImpl(createFractionMatrix(testData)) + solver = new FieldLUDecomposition(createFractionMatrix(testData)) .getSolver(); Assert.assertTrue(solver.isNonSingular()); - solver = new FieldLUDecompositionImpl(createFractionMatrix(singular)) + solver = new FieldLUDecomposition(createFractionMatrix(singular)) .getSolver(); Assert.assertFalse(solver.isNonSingular()); - solver = new FieldLUDecompositionImpl(createFractionMatrix(bigSingular)) + solver = new FieldLUDecomposition(createFractionMatrix(bigSingular)) .getSolver(); Assert.assertFalse(solver.isNonSingular()); } @@ -80,7 +80,7 @@ public class FieldLUSolverTest { @Test public void testSolveDimensionErrors() { FieldDecompositionSolver solver; - solver = new FieldLUDecompositionImpl(createFractionMatrix(testData)) + solver = new FieldLUDecomposition(createFractionMatrix(testData)) .getSolver(); FieldMatrix b = createFractionMatrix(new int[2][2]); try { @@ -101,7 +101,7 @@ public class FieldLUSolverTest { @Test public void testSolveSingularityErrors() { FieldDecompositionSolver solver; - solver = new FieldLUDecompositionImpl(createFractionMatrix(singular)) + solver = new FieldLUDecomposition(createFractionMatrix(singular)) .getSolver(); FieldMatrix b = createFractionMatrix(new int[2][2]); try { @@ -122,7 +122,7 @@ public class FieldLUSolverTest { @Test public void testSolve() { FieldDecompositionSolver solver; - solver = new FieldLUDecompositionImpl(createFractionMatrix(testData)) + solver = new FieldLUDecomposition(createFractionMatrix(testData)) .getSolver(); FieldMatrix b = createFractionMatrix(new int[][] { { 1, 0 }, { 2, -5 }, { 3, 1 } @@ -172,6 +172,6 @@ public class FieldLUSolverTest { } private double getDeterminant(final FieldMatrix m) { - return new FieldLUDecompositionImpl(m).getDeterminant().doubleValue(); + return new FieldLUDecomposition(m).getDeterminant().doubleValue(); } } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java?rev=1174537&r1=1174536&r2=1174537&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java Fri Sep 23 06:32:59 2011 @@ -297,8 +297,8 @@ public final class FieldMatrixImplTest { @Test public void testTranspose() { FieldMatrix m = new Array2DRowFieldMatrix(testData); - FieldMatrix mIT = new FieldLUDecompositionImpl(m).getSolver().getInverse().transpose(); - FieldMatrix mTI = new FieldLUDecompositionImpl(m.transpose()).getSolver().getInverse(); + FieldMatrix mIT = new FieldLUDecomposition(m).getSolver().getInverse().transpose(); + FieldMatrix mTI = new FieldLUDecomposition(m.transpose()).getSolver().getInverse(); TestUtils.assertEquals(mIT, mTI); m = new Array2DRowFieldMatrix(testData2); FieldMatrix mt = new Array2DRowFieldMatrix(testData2T); @@ -395,7 +395,7 @@ public final class FieldMatrixImplTest { Assert.assertEquals(2, p.getRowDimension()); Assert.assertEquals(2, p.getColumnDimension()); // Invert p - FieldMatrix pInverse = new FieldLUDecompositionImpl(p).getSolver().getInverse(); + FieldMatrix pInverse = new FieldLUDecomposition(p).getSolver().getInverse(); Assert.assertEquals(2, pInverse.getRowDimension()); Assert.assertEquals(2, pInverse.getColumnDimension()); @@ -410,7 +410,7 @@ public final class FieldMatrixImplTest { new Fraction(1), new Fraction(-2), new Fraction(1) }; Fraction[] solution; - solution = new FieldLUDecompositionImpl(coefficients) + solution = new FieldLUDecomposition(coefficients) .getSolver() .solve(new ArrayFieldVector(constants, false)).toArray(); Assert.assertEquals(new Fraction(2).multiply(solution[0]). Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java?rev=1174537&r1=1174536&r2=1174537&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java Fri Sep 23 06:32:59 2011 @@ -291,8 +291,8 @@ public class SparseFieldMatrixTest { @Test public void testTranspose() { FieldMatrix m = createSparseMatrix(testData); - FieldMatrix mIT = new FieldLUDecompositionImpl(m).getSolver().getInverse().transpose(); - FieldMatrix mTI = new FieldLUDecompositionImpl(m.transpose()).getSolver().getInverse(); + FieldMatrix mIT = new FieldLUDecomposition(m).getSolver().getInverse().transpose(); + FieldMatrix mTI = new FieldLUDecomposition(m.transpose()).getSolver().getInverse(); assertClose("inverse-transpose", mIT, mTI, normTolerance); m = createSparseMatrix(testData2); FieldMatrix mt = createSparseMatrix(testData2T); @@ -387,7 +387,7 @@ public class SparseFieldMatrixTest { Assert.assertEquals(2, p.getRowDimension()); Assert.assertEquals(2, p.getColumnDimension()); // Invert p - FieldMatrix pInverse = new FieldLUDecompositionImpl(p).getSolver().getInverse(); + FieldMatrix pInverse = new FieldLUDecomposition(p).getSolver().getInverse(); Assert.assertEquals(2, pInverse.getRowDimension()); Assert.assertEquals(2, pInverse.getColumnDimension()); @@ -397,7 +397,7 @@ public class SparseFieldMatrixTest { FieldMatrix coefficients = createSparseMatrix(coefficientsData); Fraction[] constants = { new Fraction(1), new Fraction(-2), new Fraction(1) }; Fraction[] solution; - solution = new FieldLUDecompositionImpl(coefficients) + solution = new FieldLUDecomposition(coefficients) .getSolver() .solve(new ArrayFieldVector(constants, false)).toArray(); Assert.assertEquals((new Fraction(2).multiply((solution[0])).add(new Fraction(3).multiply(solution[1])).subtract(new Fraction(2).multiply(solution[2]))).doubleValue(),