aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/test
diff options
context:
space:
mode:
authorGravatar Thomas Capricelli <orzel@freehackers.org>2009-08-25 14:09:19 +0200
committerGravatar Thomas Capricelli <orzel@freehackers.org>2009-08-25 14:09:19 +0200
commit3f1b81e129acae3aa9533d16210573ca44122502 (patch)
treee70e4d1f9e5d57700836f2c528d3068a5548a883 /unsupported/test
parenta736378331bde6cc5d9c9b9787c26f645eb42fae (diff)
merge both c methods lmdif/lmdif1 into one class
LevenbergMarquardtNumericalDiff with two methods.
Diffstat (limited to 'unsupported/test')
-rw-r--r--unsupported/test/NonLinear.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/unsupported/test/NonLinear.cpp b/unsupported/test/NonLinear.cpp
index 342d759e6..ca3d569cc 100644
--- a/unsupported/test/NonLinear.cpp
+++ b/unsupported/test/NonLinear.cpp
@@ -541,7 +541,9 @@ void testLmdif1()
x.setConstant(n, 1.);
// do the computation
- info = ei_lmdif1(lmdif_functor(), x, fvec);
+ lmdif_functor functor;
+ LevenbergMarquardtNumericalDiff<lmdif_functor,double> lm(functor);
+ info = lm.minimize(x, fvec);
// check return value
VERIFY( 1 == info);
@@ -569,7 +571,9 @@ void testLmdif()
x.setConstant(n, 1.);
// do the computation
- info = ei_lmdif(lmdif_functor(), x, fvec, nfev, fjac, ipvt, qtf, diag);
+ lmdif_functor functor;
+ LevenbergMarquardtNumericalDiff<lmdif_functor,double> lm(functor);
+ info = lm.minimize(x, fvec, nfev, fjac, ipvt, qtf, diag);
// check return values
VERIFY( 1 == info);