diff options
author | 2009-09-28 00:18:14 +0200 | |
---|---|---|
committer | 2009-09-28 00:18:14 +0200 | |
commit | 956d65ea631d7696c1cf9a34554c7104297790e7 (patch) | |
tree | fea2633f7c13255db3d6065d56d4d6d4921d3190 /unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h | |
parent | 7a8ec4ba2673dccee382a2fdc1b0eeb7a0917894 (diff) |
define a generic functor and makes other ones inherit it
Diffstat (limited to 'unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h')
-rw-r--r-- | unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h b/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h index 2f964358a..ed65a5651 100644 --- a/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h +++ b/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h @@ -122,7 +122,7 @@ LevenbergMarquardt<FunctorType,Scalar>::lmder1( ) { n = x.size(); - m = functor.nbOfFunctions(); + m = functor.values(); /* check the input parameters for errors. */ if (n <= 0 || m < n || tol < 0.) @@ -158,7 +158,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeInit( ) { n = x.size(); - m = functor.nbOfFunctions(); + m = functor.values(); wa1.resize(n); wa2.resize(n); wa3.resize(n); wa4.resize(m); @@ -400,7 +400,7 @@ LevenbergMarquardt<FunctorType,Scalar>::lmdif1( ) { n = x.size(); - m = functor.nbOfFunctions(); + m = functor.values(); /* check the input parameters for errors. */ if (n <= 0 || m < n || tol < 0.) @@ -422,7 +422,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiffInit( ) { n = x.size(); - m = functor.nbOfFunctions(); + m = functor.values(); wa1.resize(n); wa2.resize(n); wa3.resize(n); wa4.resize(m); @@ -677,7 +677,7 @@ LevenbergMarquardt<FunctorType,Scalar>::lmstr1( ) { n = x.size(); - m = functor.nbOfFunctions(); + m = functor.values(); Matrix< Scalar, Dynamic, Dynamic > fjac(m, n); VectorXi ipvt; @@ -701,7 +701,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOptimumStorageInit( ) { n = x.size(); - m = functor.nbOfFunctions(); + m = functor.values(); wa1.resize(n); wa2.resize(n); wa3.resize(n); wa4.resize(m); |