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

Replaced reference to DecompositionSolver.solve(double[]) by DecompositionSolver.solve(RealVector) (see MATH-653) 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1164615 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastien Brisard 2011-09-02 16:34:41 +00:00
parent c9943deeb9
commit c76d918c77
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java
View File

@ -17,18 +17,20 @@
package org.apache.commons.math.optimization.general;
import org.apache.commons.math.exception.MathUserException;
import org.apache.commons.math.exception.ConvergenceException;
import org.apache.commons.math.exception.MathUserException;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.linear.ArrayRealVector;
import org.apache.commons.math.linear.BlockRealMatrix;
import org.apache.commons.math.linear.DecompositionSolver;
import org.apache.commons.math.linear.LUDecompositionImpl;
import org.apache.commons.math.linear.QRDecompositionImpl;
import org.apache.commons.math.linear.RealMatrix;
import org.apache.commons.math.linear.RealVector;
import org.apache.commons.math.linear.SingularMatrixException;
import org.apache.commons.math.optimization.VectorialPointValuePair;
import org.apache.commons.math.optimization.ConvergenceChecker;
import org.apache.commons.math.optimization.SimpleVectorialValueChecker;
import org.apache.commons.math.optimization.VectorialPointValuePair;
/**
* Gauss-Newton least-squares solver.
@ -146,8 +148,13 @@ public class GaussNewtonOptimizer extends AbstractLeastSquaresOptimizer {
DecompositionSolver solver = useLU ?
new LUDecompositionImpl(mA).getSolver() :
new QRDecompositionImpl(mA).getSolver();
final double[] dX = solver.solve(b);
final RealVector dummy = solver.solve(new ArrayRealVector(b, false));
final double[] dX;
if (dummy instanceof ArrayRealVector){
dX = ((ArrayRealVector) dummy).getDataRef();
}else{
dX = dummy.getData();
}
// update the estimated parameters
for (int i = 0; i < cols; ++i) {
point[i] += dX[i];