mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-21 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge both c methods hybrd/hybrd1 into one class HybridNonLinearSolver with

Browse Source 
two methods.
This commit is contained in:
Thomas Capricelli 2009-08-25 13:48:25 +02:00
parent 602b13815f
commit a043708e87
4 changed files with 91 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
unsupported/Eigen/NonLinear
View File

@ -54,7 +54,6 @@ namespace Eigen {
#include "src/NonLinear/lmdif.h"
#include "src/NonLinear/hybrj.h"
#include "src/NonLinear/lmstr1.h"
#include "src/NonLinear/hybrd1.h"
#include "src/NonLinear/hybrj1.h"
#include "src/NonLinear/lmdif1.h"
#include "src/NonLinear/chkder.h"

101
unsupported/Eigen/src/NonLinear/hybrd.h
View File

@ -1,7 +1,76 @@
template<typename FunctorType, typename Scalar>
int ei_hybrd(
const FunctorType &Functor,
class HybridNonLinearSolver
{
public:
HybridNonLinearSolver(const FunctorType &_functor)
: functor(_functor) {}
int solve(
Matrix< Scalar, Dynamic, 1 > &x,
Matrix< Scalar, Dynamic, 1 > &fvec,
Scalar tol = ei_sqrt(epsilon<Scalar>())
);
int solve(
Matrix< Scalar, Dynamic, 1 > &x,
Matrix< Scalar, Dynamic, 1 > &fvec,
int &nfev,
Matrix< Scalar, Dynamic, Dynamic > &fjac,
Matrix< Scalar, Dynamic, 1 > &R,
Matrix< Scalar, Dynamic, 1 > &qtf,
Matrix< Scalar, Dynamic, 1 > &diag,
int mode=1,
int nb_of_subdiagonals = -1,
int nb_of_superdiagonals = -1,
int maxfev = 2000,
Scalar factor = Scalar(100.),
Scalar xtol = ei_sqrt(epsilon<Scalar>()),
Scalar epsfcn = Scalar(0.),
int nprint=0
);
private:
const FunctorType &functor;
};
template<typename FunctorType, typename Scalar>
int HybridNonLinearSolver<FunctorType,Scalar>::solve(
Matrix< Scalar, Dynamic, 1 > &x,
Matrix< Scalar, Dynamic, 1 > &fvec,
Scalar tol
)
{
const int n = x.size();
int info, nfev=0;
Matrix< Scalar, Dynamic, Dynamic > fjac;
Matrix< Scalar, Dynamic, 1> R, qtf, diag;
/* check the input parameters for errors. */
if (n <= 0 || tol < 0.) {
printf("solve bad args : n,tol,...");
return 0;
}
diag.setConstant(n, 1.);
info = solve(
x, fvec,
nfev,
fjac,
R, qtf, diag,
2,
-1, -1,
(n+1)*200,
100.,
tol, Scalar(0.)
);
return (info==5)?4:info;
}
template<typename FunctorType, typename Scalar>
int HybridNonLinearSolver<FunctorType,Scalar>::solve(
Matrix< Scalar, Dynamic, 1 > &x,
Matrix< Scalar, Dynamic, 1 > &fvec,
int &nfev,
@ -9,14 +78,14 @@ int ei_hybrd(
Matrix< Scalar, Dynamic, 1 > &R,
Matrix< Scalar, Dynamic, 1 > &qtf,
Matrix< Scalar, Dynamic, 1 > &diag,
int mode=1,
int nb_of_subdiagonals = -1,
int nb_of_superdiagonals = -1,
int maxfev = 2000,
Scalar factor = Scalar(100.),
Scalar xtol = ei_sqrt(epsilon<Scalar>()),
Scalar epsfcn = Scalar(0.),
int nprint=0
int mode,
int nb_of_subdiagonals,
int nb_of_superdiagonals,
int maxfev,
Scalar factor,
Scalar xtol,
Scalar epsfcn,
int nprint
)
{
const int n = x.size();
@ -65,7 +134,7 @@ int ei_hybrd(
/* evaluate the function at the starting point */
/* and calculate its norm. */
iflag = Functor.f(x, fvec);
iflag = functor.f(x, fvec);
nfev = 1;
if (iflag < 0)
goto algo_end;
@ -92,7 +161,7 @@ int ei_hybrd(
/* calculate the jacobian matrix. */
iflag = ei_fdjac1(Functor, x, fvec, fjac,
iflag = ei_fdjac1(functor, x, fvec, fjac,
nb_of_subdiagonals, nb_of_superdiagonals, epsfcn);
nfev += msum;
if (iflag < 0)
@ -164,12 +233,12 @@ int ei_hybrd(
/* beginning of the inner loop. */
while (true) {
/* if requested, call Functor.f to enable printing of iterates. */
/* if requested, call functor.f to enable printing of iterates. */
if (nprint > 0) {
iflag = 0;
if ((iter - 1) % nprint == 0)
iflag = Functor.debug(x, fvec);
iflag = functor.debug(x, fvec);
if (iflag < 0)
goto algo_end;
}
@ -192,7 +261,7 @@ int ei_hybrd(
/* evaluate the function at x + p and calculate its norm. */
iflag = Functor.f(wa2, wa4);
iflag = functor.f(wa2, wa4);
++nfev;
if (iflag < 0)
goto algo_end;
@ -320,7 +389,7 @@ algo_end:
if (iflag < 0)
info = iflag;
if (nprint > 0)
iflag = Functor.debug(x, fvec);
iflag = functor.debug(x, fvec);
return info;
}

36
unsupported/Eigen/src/NonLinear/hybrd1.h
View File

@ -1,36 +0,0 @@
template<typename FunctorType, typename Scalar>
int ei_hybrd1(
const FunctorType &Functor,
Matrix< Scalar, Dynamic, 1 > &x,
Matrix< Scalar, Dynamic, 1 > &fvec,
Scalar tol = ei_sqrt(epsilon<Scalar>())
)
{
const int n = x.size();
int info, nfev=0;
Matrix< Scalar, Dynamic, Dynamic > fjac;
Matrix< Scalar, Dynamic, 1> R, qtf, diag;
/* check the input parameters for errors. */
if (n <= 0 || tol < 0.) {
printf("ei_hybrd1 bad args : n,tol,...");
return 0;
}
diag.setConstant(n, 1.);
info = ei_hybrd(
Functor,
x, fvec,
nfev,
fjac,
R, qtf, diag,
2,
-1, -1,
(n+1)*200,
100.,
tol, Scalar(0.)
);
return (info==5)?4:info;
}

8
unsupported/test/NonLinear.cpp
View File

@ -352,7 +352,9 @@ void testHybrd1()
x.setConstant(n, -1.);
// do the computation
info = ei_hybrd1(hybrd_functor(), x, fvec);
hybrd_functor functor;
HybridNonLinearSolver <hybrd_functor,double> solver(functor);
info = solver.solve(x, fvec);
// check return value
VERIFY( 1 == info);
@ -382,7 +384,9 @@ void testHybrd()
diag.setConstant(n, 1.);
// do the computation
info = ei_hybrd(hybrd_functor(), x,fvec, nfev, fjac, R, qtf, diag, mode, ml, mu);
hybrd_functor functor;
HybridNonLinearSolver <hybrd_functor,double> solver(functor);
info = solver.solve(x,fvec, nfev, fjac, R, qtf, diag, mode, ml, mu);
// check return value
VERIFY( 1 == info);