diff options
| author |  Thomas Capricelli <orzel@freehackers.org> | 2009-11-26 05:48:38 +0100 |
|---|---|---|
| committer | Thomas Capricelli <orzel@freehackers.org> | 2009-11-26 05:48:38 +0100 |
| commit | db39f892a36b1a754abfdf70ea8d5402b295492d (patch) | |
| tree | 53ce6ddc271dcf83f5a7ff4269f4d0724fc8f1eb /unsupported | |
| parent | 905aecf803341a88046861e6596fc8de8220aacc (diff) | |
kill yet another un-needed parameter
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h | 6 | ||||
| -rw-r--r-- | unsupported/Eigen/src/NonLinearOptimization/lmpar.h | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h b/unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h index c611ec595..5895fb578 100644 --- a/unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h +++ b/unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h @@ -320,7 +320,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOneStep( /* determine the levenberg-marquardt parameter. */ - ei_lmpar<Scalar>(fjac, ipvt, diag, qtf, delta, par, wa1, wa2); + ei_lmpar<Scalar>(fjac, ipvt, diag, qtf, delta, par, wa1); /* store the direction p and x + p. calculate the norm of p. */ @@ -433,8 +433,6 @@ LevenbergMarquardt<FunctorType,Scalar>::lmstr1( { n = x.size(); m = functor.values(); - JacobianType fjac(m, n); - VectorXi ipvt; /* check the input parameters for errors. */ if (n <= 0 || m < n || tol < 0.) @@ -605,7 +603,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOptimumStorageOneStep( /* determine the levenberg-marquardt parameter. */ - ei_lmpar<Scalar>(fjac, ipvt, diag, qtf, delta, par, wa1, wa2); + ei_lmpar<Scalar>(fjac, ipvt, diag, qtf, delta, par, wa1); /* store the direction p and x + p. calculate the norm of p. */ diff --git a/unsupported/Eigen/src/NonLinearOptimization/lmpar.h b/unsupported/Eigen/src/NonLinearOptimization/lmpar.h index c1ab2626c..77c07a8db 100644 --- a/unsupported/Eigen/src/NonLinearOptimization/lmpar.h +++ b/unsupported/Eigen/src/NonLinearOptimization/lmpar.h @@ -7,8 +7,7 @@ void ei_lmpar( const Matrix< Scalar, Dynamic, 1 > &qtb, Scalar delta, Scalar &par, - Matrix< Scalar, Dynamic, 1 > &x, - Matrix< Scalar, Dynamic, 1 > &sdiag) + Matrix< Scalar, Dynamic, 1 > &x) { /* Local variables */ int i, j, k, l; @@ -122,6 +121,7 @@ void ei_lmpar( temp = ei_sqrt(par); wa1 = temp * diag; + Matrix< Scalar, Dynamic, 1 > sdiag(n); ei_qrsolv<Scalar>(r, ipvt, wa1, qtb, x, sdiag); wa2 = diag.cwise() * x; |