GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 11:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

check number of evaluation even in the case of *1(), now we have it..

Browse Source
This commit is contained in:
Thomas Capricelli 2009-08-26 14:47:10 +02:00
parent 458947af5e
commit 16d08b2b0f
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h
View File

@ -457,6 +457,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiffInit(
/* Function Body */ /* Function Body */
nfev = 0; nfev = 0;
njev = 0;
/* check the input parameters for errors. */ /* check the input parameters for errors. */

1
unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h
View File

@ -437,6 +437,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiffInit(
/* Function Body */ /* Function Body */
nfev = 0; nfev = 0;
njev = 0;
/* check the input parameters for errors. */ /* check the input parameters for errors. */

11
unsupported/test/NonLinear.cpp
View File

@ -158,6 +158,8 @@ void testLmder1()
// check return value // check return value
VERIFY( 1 == info); VERIFY( 1 == info);
VERIFY(lm.nfev==6);
VERIFY(lm.njev==5);
// check norm // check norm
VERIFY_IS_APPROX(lm.fvec.blueNorm(), 0.09063596); VERIFY_IS_APPROX(lm.fvec.blueNorm(), 0.09063596);
@ -273,6 +275,8 @@ void testHybrj1()
// check return value // check return value
VERIFY( 1 == info); VERIFY( 1 == info);
VERIFY(solver.nfev==11);
VERIFY(solver.njev==1);
// check norm // check norm
VERIFY_IS_APPROX(solver.fvec.blueNorm(), 1.192636e-08); VERIFY_IS_APPROX(solver.fvec.blueNorm(), 1.192636e-08);
@ -358,6 +362,7 @@ void testHybrd1()
// check return value // check return value
VERIFY( 1 == info); VERIFY( 1 == info);
VERIFY(solver.nfev==20);
// check norm // check norm
VERIFY_IS_APPROX(solver.fvec.blueNorm(), 1.192636e-08); VERIFY_IS_APPROX(solver.fvec.blueNorm(), 1.192636e-08);
@ -458,6 +463,8 @@ void testLmstr1()
// check return value // check return value
VERIFY( 1 == info); VERIFY( 1 == info);
VERIFY(lm.nfev==6);
VERIFY(lm.njev==5);
// check norm // check norm
VERIFY_IS_APPROX(lm.fvec.blueNorm(), 0.09063596); VERIFY_IS_APPROX(lm.fvec.blueNorm(), 0.09063596);
@ -543,6 +550,7 @@ void testLmdif1()
// check return value // check return value
VERIFY( 1 == info); VERIFY( 1 == info);
VERIFY(lm.nfev==21);
// check norm // check norm
VERIFY_IS_APPROX(lm.fvec.blueNorm(), 0.09063596); VERIFY_IS_APPROX(lm.fvec.blueNorm(), 0.09063596);
@ -1813,6 +1821,9 @@ void test_NonLinear()
/* /*
* Can be useful for debugging... * Can be useful for debugging...
printf("info, nfev, njev : %d, %d, %d\n", info, lm.nfev, lm.njev); printf("info, nfev, njev : %d, %d, %d\n", info, lm.nfev, lm.njev);
printf("info, nfev : %d, %d\n", info, lm.nfev);
printf("info, nfev, njev : %d, %d, %d\n", info, solver.nfev, solver.njev);
printf("info, nfev : %d, %d\n", info, solver.nfev);
printf("x[0] : %.32g\n", x[0]); printf("x[0] : %.32g\n", x[0]);
printf("x[1] : %.32g\n", x[1]); printf("x[1] : %.32g\n", x[1]);
printf("x[2] : %.32g\n", x[2]); printf("x[2] : %.32g\n", x[2]);