diff options
| author |  Thomas Capricelli <orzel@freehackers.org> | 2009-09-28 00:32:31 +0200 |
|---|---|---|
| committer | Thomas Capricelli <orzel@freehackers.org> | 2009-09-28 00:32:31 +0200 |
| commit | bee14ee8e606c2686785a986a37a6a2f9493c416 (patch) | |
| tree | b0d395777d3d7705cf9b6ff711a5a175602bc958 /unsupported/Eigen/src | |
| parent | 956d65ea631d7696c1cf9a34554c7104297790e7 (diff) | |
use operator() so that to be coherent with eigen AutoDiff functor
Diffstat (limited to 'unsupported/Eigen/src')
| -rw-r--r-- | unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h | 8 | ||||
| -rw-r--r-- | unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h | 12 | ||||
| -rw-r--r-- | unsupported/Eigen/src/NonLinear/fdjac1.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/src/NonLinear/fdjac2.h | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h index 188313b2c..7f78d744f 100644 --- a/unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h +++ b/unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h @@ -157,7 +157,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveInit( /* and calculate its norm. */ nfev = 1; - if ( functor.f(x, fvec) < 0) + if ( functor(x, fvec) < 0) return UserAksed; fnorm = fvec.stableNorm(); @@ -273,7 +273,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveOneStep( /* evaluate the function at x + p and calculate its norm. */ - if ( functor.f(wa2, wa4) < 0) + if ( functor(wa2, wa4) < 0) return UserAksed; ++nfev; fnorm1 = wa4.stableNorm(); @@ -472,7 +472,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiffInit( /* and calculate its norm. */ nfev = 1; - if ( functor.f(x, fvec) < 0) + if ( functor(x, fvec) < 0) return UserAksed; fnorm = fvec.stableNorm(); @@ -590,7 +590,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiffOneStep( /* evaluate the function at x + p and calculate its norm. */ - if ( functor.f(wa2, wa4) < 0) + if ( functor(wa2, wa4) < 0) return UserAksed; ++nfev; fnorm1 = wa4.stableNorm(); diff --git a/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h b/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h index ed65a5651..687d2dd20 100644 --- a/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h +++ b/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h @@ -188,7 +188,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeInit( /* and calculate its norm. */ nfev = 1; - if ( functor.f(x, fvec) < 0) + if ( functor(x, fvec) < 0) return UserAsked; fnorm = fvec.stableNorm(); @@ -304,7 +304,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOneStep( /* evaluate the function at x + p and calculate its norm. */ - if ( functor.f(wa2, wa4) < 0) + if ( functor(wa2, wa4) < 0) return UserAsked; ++nfev; fnorm1 = wa4.stableNorm(); @@ -451,7 +451,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiffInit( /* and calculate its norm. */ nfev = 1; - if ( functor.f(x, fvec) < 0) + if ( functor(x, fvec) < 0) return UserAsked; fnorm = fvec.stableNorm(); @@ -567,7 +567,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiffOneStep( /* evaluate the function at x + p and calculate its norm. */ - if ( functor.f(wa2, wa4) < 0) + if ( functor(wa2, wa4) < 0) return UserAsked; ++nfev; fnorm1 = wa4.stableNorm(); @@ -731,7 +731,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOptimumStorageInit( /* and calculate its norm. */ nfev = 1; - if ( functor.f(x, fvec) < 0) + if ( functor(x, fvec) < 0) return UserAsked; fnorm = fvec.stableNorm(); @@ -865,7 +865,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOptimumStorageOneStep( /* evaluate the function at x + p and calculate its norm. */ - if ( functor.f(wa2, wa4) < 0) + if ( functor(wa2, wa4) < 0) return UserAsked; ++nfev; fnorm1 = wa4.stableNorm(); diff --git a/unsupported/Eigen/src/NonLinear/fdjac1.h b/unsupported/Eigen/src/NonLinear/fdjac1.h index 64c742ab7..376df7c40 100644 --- a/unsupported/Eigen/src/NonLinear/fdjac1.h +++ b/unsupported/Eigen/src/NonLinear/fdjac1.h @@ -32,7 +32,7 @@ int ei_fdjac1( if (h == 0.) h = eps; x[j] = temp + h; - iflag = Functor.f(x, wa1); + iflag = Functor(x, wa1); if (iflag < 0) return iflag; x[j] = temp; @@ -48,7 +48,7 @@ int ei_fdjac1( if (h == 0.) h = eps; x[j] = wa2[j] + h; } - iflag = Functor.f(x, wa1); + iflag = Functor(x, wa1); if (iflag < 0) { return iflag; } diff --git a/unsupported/Eigen/src/NonLinear/fdjac2.h b/unsupported/Eigen/src/NonLinear/fdjac2.h index 8766a9566..cb360d84c 100644 --- a/unsupported/Eigen/src/NonLinear/fdjac2.h +++ b/unsupported/Eigen/src/NonLinear/fdjac2.h @@ -24,7 +24,7 @@ int ei_fdjac2( h = eps; } x[j] = temp + h; - iflag = Functor.f(x, wa); + iflag = Functor(x, wa); if (iflag < 0) return iflag; x[j] = temp; |