Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed double[] solve(double[]) from QRDecompositionImpl.Solver 

Had to implement toArray() in ArrayRealVectorTest to make QRSolverTest pass.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1165507 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastien Brisard 2011-09-06 06:23:06 +00:00
parent 86ae5a8c90
commit 7471813924
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/org/apache/commons/math/linear/QRDecompositionImpl.java
View File

@ -275,18 +275,18 @@ public class QRDecompositionImpl implements QRDecomposition {
}
/** {@inheritDoc} */
public double[] solve(double[] b) {
public RealVector solve(RealVector b) {
final int n = qrt.length;
final int m = qrt[0].length;
if (b.length != m) {
throw new DimensionMismatchException(b.length, m);
if (b.getDimension() != m) {
throw new DimensionMismatchException(b.getDimension(), m);
}
if (!isNonSingular()) {
throw new SingularMatrixException();
}
final double[] x = new double[n];
final double[] y = b.clone();
final double[] y = b.toArray();
// apply Householder transforms to solve Q.y = b
for (int minor = 0; minor < FastMath.min(m, n); minor++) {
@ -306,7 +306,7 @@ public class QRDecompositionImpl implements QRDecomposition {
// solve triangular system R.x = y
for (int row = rDiag.length - 1; row >= 0; --row) {
y[row] /= rDiag[row];
final double yRow = y[row];
final double yRow = y[row];
final double[] qrtRow = qrt[row];
x[row] = yRow;
for (int i = 0; i < row; i++) {
@ -314,27 +314,7 @@ public class QRDecompositionImpl implements QRDecomposition {
}
}
return x;
}
/** {@inheritDoc} */
public RealVector solve(RealVector b) {
try {
return solve((ArrayRealVector) b);
} catch (ClassCastException cce) {
return new ArrayRealVector(solve(b.getData()), false);
}
}
/** Solve the linear equation A &times; X = B.
* <p>The A matrix is implicit here. It is </p>
* @param b right-hand side of the equation A &times; X = B
* @return a vector X that minimizes the two norm of A &times; X - B
* @throws DimensionMismatchException if the matrices dimensions do not match.
* @throws SingularMatrixException if the decomposed matrix is singular.
*/
public ArrayRealVector solve(ArrayRealVector b) {
return new ArrayRealVector(solve(b.getDataRef()), false);
return new ArrayRealVector(x, false);
}
/** {@inheritDoc} */

2
src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java
View File

@ -333,7 +333,7 @@ public class ArrayRealVectorTest {
}
public double[] toArray() {
throw unsupported();
return data.clone();
}
public boolean isNaN() {