From bbd44ef0ad1a8d2f51faf9700087787ada31c564 Mon Sep 17 00:00:00 2001
From: Thomas Capricelli <orzel@freehackers.org>
Date: Tue, 25 Aug 2009 23:37:27 +0200
Subject: [PATCH] move more stuff into Parameters

---
 .../src/NonLinear/HybridNonLinearSolver.h     | 30 ++++++++++---------
 .../Eigen/src/NonLinear/LevenbergMarquardt.h  | 12 ++++----
 unsupported/test/NonLinear.cpp                |  9 +++---
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h
index 0c4113b2e..8f69a74a6 100644
--- a/unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h
@@ -21,10 +21,16 @@ public:
         Parameters()
             : factor(Scalar(100.))
             , maxfev(1000)
-            , xtol(ei_sqrt(epsilon<Scalar>())) {}
+            , xtol(ei_sqrt(epsilon<Scalar>()))
+            , nb_of_subdiagonals(-1)
+            , nb_of_superdiagonals(-1)
+            , epsfcn (Scalar(0.)) {}
         Scalar factor;
         int maxfev;   // maximum number of function evaluation
         Scalar xtol;
+        int nb_of_subdiagonals;
+        int nb_of_superdiagonals;
+        Scalar epsfcn;
     };
 
     Status solve(
@@ -44,10 +50,7 @@ public:
     Status solveNumericalDiff(
             Matrix< Scalar, Dynamic, 1 >  &x,
             const Parameters &parameters,
-            const int mode=1,
-            int nb_of_subdiagonals = -1,
-            int nb_of_superdiagonals = -1,
-            const Scalar epsfcn = Scalar(0.)
+            const int mode=1
             );
 
     Matrix< Scalar, Dynamic, 1 >  fvec;
@@ -406,16 +409,15 @@ typename HybridNonLinearSolver<FunctorType,Scalar>::Status
 HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiff(
         Matrix< Scalar, Dynamic, 1 >  &x,
         const Parameters &parameters,
-        const int mode,
-        int nb_of_subdiagonals,
-        int nb_of_superdiagonals,
-        const Scalar epsfcn
+        const int mode
         )
 {
     n = x.size();
 
-    if (nb_of_subdiagonals<0) nb_of_subdiagonals = n-1;
-    if (nb_of_superdiagonals<0) nb_of_superdiagonals = n-1;
+    int nsub = parameters.nb_of_subdiagonals;
+    int nsup = parameters.nb_of_superdiagonals;
+    if (nsub<0) nsub= n-1;
+    if (nsup<0) nsup= n-1;
 
     wa1.resize(n); wa2.resize(n); wa3.resize(n); wa4.resize(n);
     qtf.resize(n);
@@ -432,7 +434,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiff(
 
     /*     check the input parameters for errors. */
 
-    if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 || nb_of_subdiagonals < 0 || nb_of_superdiagonals < 0 || parameters.factor <= 0. )
+    if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 || nsub< 0 || nsup< 0 || parameters.factor <= 0. )
         return ImproperInputParameters;
     if (mode == 2)
         for (int j = 0; j < n; ++j)
@@ -463,9 +465,9 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiff(
 
         /* calculate the jacobian matrix. */
 
-        if (ei_fdjac1(functor, x, fvec, fjac, nb_of_subdiagonals, nb_of_superdiagonals, epsfcn) <0)
+        if (ei_fdjac1(functor, x, fvec, fjac, nsub, nsup, parameters.epsfcn) <0)
             return UserAksed;
-        nfev += std::min(nb_of_subdiagonals + nb_of_superdiagonals + 1, n);
+        nfev += std::min(nsub+ nsup+ 1, n);
 
         /* compute the qr factorization of the jacobian. */
 
diff --git a/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h b/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h
index b477268ed..792438aa4 100644
--- a/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h
+++ b/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h
@@ -26,12 +26,14 @@ public:
             , maxfev(400)
             , ftol(ei_sqrt(epsilon<Scalar>()))
             , xtol(ei_sqrt(epsilon<Scalar>()))
-            , gtol(Scalar(0.)) { }
+            , gtol(Scalar(0.))
+            , epsfcn (Scalar(0.)) {}
         Scalar factor;
         int maxfev;   // maximum number of function evaluation
         Scalar ftol;
         Scalar xtol;
         Scalar gtol;
+        Scalar epsfcn;
     };
 
     Status minimize(
@@ -53,8 +55,7 @@ public:
     Status minimizeNumericalDiff(
             Matrix< Scalar, Dynamic, 1 >  &x,
             const Parameters &parameters,
-            const int mode=1,
-            const Scalar epsfcn = Scalar(0.)
+            const int mode=1
             );
 
     Status minimizeOptimumStorage(
@@ -387,8 +388,7 @@ typename LevenbergMarquardt<FunctorType,Scalar>::Status
 LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiff(
         Matrix< Scalar, Dynamic, 1 >  &x,
         const Parameters &parameters,
-        const int mode,
-        const Scalar epsfcn
+        const int mode
         )
 {
     n = x.size();
@@ -436,7 +436,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiff(
 
         /* calculate the jacobian matrix. */
 
-        if ( ei_fdjac2(functor, x, fvec, fjac, epsfcn) < 0)
+        if ( ei_fdjac2(functor, x, fvec, fjac, parameters.epsfcn) < 0)
             return UserAsked;
         nfev += n;
 
diff --git a/unsupported/test/NonLinear.cpp b/unsupported/test/NonLinear.cpp
index 1199d3a39..995172474 100644
--- a/unsupported/test/NonLinear.cpp
+++ b/unsupported/test/NonLinear.cpp
@@ -373,21 +373,20 @@ void testHybrd1()
 void testHybrd()
 {
   const int n=9;
-  int info, ml, mu;
+  int info;
   VectorXd x;
 
   /* the following starting values provide a rough fit. */
   x.setConstant(n, -1.);
 
-  ml = 1;
-  mu = 1;
-
   // do the computation
   hybrd_functor functor;
   HybridNonLinearSolver<hybrd_functor> solver(functor);
   HybridNonLinearSolver<hybrd_functor>::Parameters parameters;
+  parameters.nb_of_subdiagonals = 1;
+  parameters.nb_of_superdiagonals = 1;
   solver.diag.setConstant(n, 1.);
-  info = solver.solveNumericalDiff(x, parameters, 2, ml, mu);
+  info = solver.solveNumericalDiff(x, parameters, 2);
 
   // check return value
   VERIFY( 1 == info);