diff options
| author |  Thomas Capricelli <orzel@freehackers.org> | 2009-08-23 04:06:16 +0200 |
|---|---|---|
| committer | Thomas Capricelli <orzel@freehackers.org> | 2009-08-23 04:06:16 +0200 |
| commit | 878f15b8a56ba1c19a6b44fbd5955ac702e46a06 (patch) | |
| tree | 9309b3ef82515c8af58692ec6c7d44577688a4f5 /unsupported/Eigen/src/NonLinear/fdjac2.h | |
| parent | f2fcbb0207dc1cd3d76c8cffacf92af36ab858ba (diff) | |
* use eigen object for callbacks for hybrd and lmdif
* use Functor instead of argument for ei_fdjac*()
Diffstat (limited to 'unsupported/Eigen/src/NonLinear/fdjac2.h')
| -rw-r--r-- | unsupported/Eigen/src/NonLinear/fdjac2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unsupported/Eigen/src/NonLinear/fdjac2.h b/unsupported/Eigen/src/NonLinear/fdjac2.h index c8cd74b20..2a4b9734b 100644 --- a/unsupported/Eigen/src/NonLinear/fdjac2.h +++ b/unsupported/Eigen/src/NonLinear/fdjac2.h @@ -1,6 +1,6 @@ -template <typename Scalar> -int ei_fdjac2(minpack_func_mn fcn, +template<typename Functor, typename Scalar> +int ei_fdjac2( Matrix< Scalar, Dynamic, 1 > &x, Matrix< Scalar, Dynamic, 1 > &fvec, Matrix< Scalar, Dynamic, Dynamic > &fjac, @@ -26,7 +26,7 @@ int ei_fdjac2(minpack_func_mn fcn, h = eps; } x[j] = temp + h; - iflag = (*fcn)(m, n, x.data(), wa.data(), 1); + iflag = Functor::f(x, wa, 1); if (iflag < 0) { /* goto L30; */ return iflag; |