From 38fc6c8553ff0b145e261d8e368a9020fb0e3078 Mon Sep 17 00:00:00 2001 From: Thomas Capricelli Date: Tue, 25 Aug 2009 14:28:19 +0200 Subject: cleaning --- unsupported/Eigen/src/NonLinear/hybrd.h | 28 ++++++++++---------- unsupported/Eigen/src/NonLinear/hybrj.h | 24 ++++++++--------- unsupported/Eigen/src/NonLinear/lmder.h | 46 ++++++++++++++++----------------- unsupported/Eigen/src/NonLinear/lmdif.h | 35 ++++++++++++------------- unsupported/Eigen/src/NonLinear/lmstr.h | 33 +++++++++++------------ 5 files changed, 83 insertions(+), 83 deletions(-) (limited to 'unsupported/Eigen') diff --git a/unsupported/Eigen/src/NonLinear/hybrd.h b/unsupported/Eigen/src/NonLinear/hybrd.h index 210313e45..cb3cb5af0 100644 --- a/unsupported/Eigen/src/NonLinear/hybrd.h +++ b/unsupported/Eigen/src/NonLinear/hybrd.h @@ -10,7 +10,7 @@ public: Matrix< Scalar, Dynamic, 1 > &x, Matrix< Scalar, Dynamic, 1 > &fvec, Matrix< Scalar, Dynamic, Dynamic > &fjac, - Scalar tol = ei_sqrt(epsilon()) + const Scalar tol = ei_sqrt(epsilon()) ); int solve( Matrix< Scalar, Dynamic, 1 > &x, @@ -20,14 +20,14 @@ public: Matrix< Scalar, Dynamic, 1 > &R, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode=1, + const 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 epsfcn = Scalar(0.), - int nprint=0 + const int maxfev = 2000, + const Scalar factor = Scalar(100.), + const Scalar xtol = ei_sqrt(epsilon()), + const Scalar epsfcn = Scalar(0.), + const int nprint=0 ); private: @@ -41,7 +41,7 @@ int HybridNonLinearSolverNumericalDiff::solve( Matrix< Scalar, Dynamic, 1 > &x, Matrix< Scalar, Dynamic, 1 > &fvec, Matrix< Scalar, Dynamic, Dynamic > &fjac, - Scalar tol + const Scalar tol ) { const int n = x.size(); @@ -79,14 +79,14 @@ int HybridNonLinearSolverNumericalDiff::solve( Matrix< Scalar, Dynamic, 1 > &R, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode, + const int mode, int nb_of_subdiagonals, int nb_of_superdiagonals, - int maxfev, - Scalar factor, - Scalar xtol, - Scalar epsfcn, - int nprint + const int maxfev, + const Scalar factor, + const Scalar xtol, + const Scalar epsfcn, + const int nprint ) { const int n = x.size(); diff --git a/unsupported/Eigen/src/NonLinear/hybrj.h b/unsupported/Eigen/src/NonLinear/hybrj.h index f120572c4..4f67fd646 100644 --- a/unsupported/Eigen/src/NonLinear/hybrj.h +++ b/unsupported/Eigen/src/NonLinear/hybrj.h @@ -10,7 +10,7 @@ public: Matrix< Scalar, Dynamic, 1 > &x, Matrix< Scalar, Dynamic, 1 > &fvec, Matrix< Scalar, Dynamic, Dynamic > &fjac, - Scalar tol = ei_sqrt(epsilon()) + const Scalar tol = ei_sqrt(epsilon()) ); int solve( Matrix< Scalar, Dynamic, 1 > &x, @@ -20,11 +20,11 @@ public: Matrix< Scalar, Dynamic, 1 > &R, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode=1, - int maxfev = 1000, - Scalar factor = Scalar(100.), - Scalar xtol = ei_sqrt(epsilon()), - int nprint=0 + const int mode=1, + const int maxfev = 1000, + const Scalar factor = Scalar(100.), + const Scalar xtol = ei_sqrt(epsilon()), + const int nprint=0 ); private: @@ -38,7 +38,7 @@ int HybridNonLinearSolver::solve( Matrix< Scalar, Dynamic, 1 > &x, Matrix< Scalar, Dynamic, 1 > &fvec, Matrix< Scalar, Dynamic, Dynamic > &fjac, - Scalar tol + const Scalar tol ) { const int n = x.size(); @@ -77,11 +77,11 @@ int HybridNonLinearSolver::solve( Matrix< Scalar, Dynamic, 1 > &R, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode, - int maxfev, - Scalar factor, - Scalar xtol, - int nprint + const int mode, + const int maxfev, + const Scalar factor, + const Scalar xtol, + const int nprint ) { const int n = x.size(); diff --git a/unsupported/Eigen/src/NonLinear/lmder.h b/unsupported/Eigen/src/NonLinear/lmder.h index 2e9f0d7f5..5c1000957 100644 --- a/unsupported/Eigen/src/NonLinear/lmder.h +++ b/unsupported/Eigen/src/NonLinear/lmder.h @@ -21,13 +21,13 @@ public: VectorXi &ipvt, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode=1, - Scalar factor = 100., - int maxfev = 400, - Scalar ftol = ei_sqrt(epsilon()), - Scalar xtol = ei_sqrt(epsilon()), - Scalar gtol = Scalar(0.), - int nprint=0 + const int mode=1, + const Scalar factor = 100., + const int maxfev = 400, + const Scalar ftol = ei_sqrt(epsilon()), + const Scalar xtol = ei_sqrt(epsilon()), + const Scalar gtol = Scalar(0.), + const int nprint=0 ); private: @@ -46,7 +46,7 @@ int LevenbergMarquardt::minimize( int info, nfev=0, njev=0; Matrix< Scalar, Dynamic, Dynamic > fjac(m, n); Matrix< Scalar, Dynamic, 1> diag, qtf; - VectorXi ipvt(n); + VectorXi ipvt; /* check the input parameters for errors. */ if (n <= 0 || m < n || tol < 0.) { @@ -55,14 +55,14 @@ int LevenbergMarquardt::minimize( } info = minimize( - x, fvec, - nfev, njev, - fjac, ipvt, qtf, diag, - 1, - 100., - (n+1)*100, - tol, tol, Scalar(0.) - ); + x, fvec, + nfev, njev, + fjac, ipvt, qtf, diag, + 1, + 100., + (n+1)*100, + tol, tol, Scalar(0.) + ); return (info==8)?4:info; } @@ -77,13 +77,13 @@ int LevenbergMarquardt::minimize( VectorXi &ipvt, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode, - Scalar factor, - int maxfev, - Scalar ftol, - Scalar xtol, - Scalar gtol, - int nprint + const int mode, + const Scalar factor, + const int maxfev, + const Scalar ftol, + const Scalar xtol, + const Scalar gtol, + const int nprint ) { const int m = fvec.size(), n = x.size(); diff --git a/unsupported/Eigen/src/NonLinear/lmdif.h b/unsupported/Eigen/src/NonLinear/lmdif.h index 2da465b72..701fd5f75 100644 --- a/unsupported/Eigen/src/NonLinear/lmdif.h +++ b/unsupported/Eigen/src/NonLinear/lmdif.h @@ -1,5 +1,4 @@ - template class LevenbergMarquardtNumericalDiff { @@ -21,14 +20,14 @@ public: VectorXi &ipvt, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode=1, - Scalar factor = 100., - int maxfev = 400, - Scalar ftol = ei_sqrt(epsilon()), - Scalar xtol = ei_sqrt(epsilon()), - Scalar gtol = Scalar(0.), - Scalar epsfcn = Scalar(0.), - int nprint=0 + const int mode=1, + const Scalar factor = 100., + const int maxfev = 400, + const Scalar ftol = ei_sqrt(epsilon()), + const Scalar xtol = ei_sqrt(epsilon()), + const Scalar gtol = Scalar(0.), + const Scalar epsfcn = Scalar(0.), + const int nprint=0 ); private: @@ -40,7 +39,7 @@ template int LevenbergMarquardtNumericalDiff::minimize( Matrix< Scalar, Dynamic, 1 > &x, Matrix< Scalar, Dynamic, 1 > &fvec, - Scalar tol + const Scalar tol ) { const int n = x.size(), m=fvec.size(); @@ -76,14 +75,14 @@ int LevenbergMarquardtNumericalDiff::minimize( VectorXi &ipvt, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode, - Scalar factor, - int maxfev, - Scalar ftol, - Scalar xtol, - Scalar gtol, - Scalar epsfcn, - int nprint + const int mode, + const Scalar factor, + const int maxfev, + const Scalar ftol, + const Scalar xtol, + const Scalar gtol, + const Scalar epsfcn, + const int nprint ) { const int m = fvec.size(), n = x.size(); diff --git a/unsupported/Eigen/src/NonLinear/lmstr.h b/unsupported/Eigen/src/NonLinear/lmstr.h index 64a0daafe..ecc16ad0e 100644 --- a/unsupported/Eigen/src/NonLinear/lmstr.h +++ b/unsupported/Eigen/src/NonLinear/lmstr.h @@ -21,13 +21,13 @@ public: VectorXi &ipvt, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode=1, - Scalar factor = 100., - int maxfev = 400, - Scalar ftol = ei_sqrt(epsilon()), - Scalar xtol = ei_sqrt(epsilon()), - Scalar gtol = Scalar(0.), - int nprint=0 + const int mode=1, + const Scalar factor = 100., + const int maxfev = 400, + const Scalar ftol = ei_sqrt(epsilon()), + const Scalar xtol = ei_sqrt(epsilon()), + const Scalar gtol = Scalar(0.), + const int nprint=0 ); private: @@ -39,14 +39,14 @@ template int LevenbergMarquardtOptimumStorage::minimize( Matrix< Scalar, Dynamic, 1 > &x, Matrix< Scalar, Dynamic, 1 > &fvec, - Scalar tol + const Scalar tol ) { const int n = x.size(), m=fvec.size(); int info, nfev=0, njev=0; Matrix< Scalar, Dynamic, Dynamic > fjac(m, n); Matrix< Scalar, Dynamic, 1> diag, qtf; - VectorXi ipvt(n); + VectorXi ipvt; /* check the input parameters for errors. */ if (n <= 0 || m < n || tol < 0.) { @@ -76,13 +76,13 @@ int LevenbergMarquardtOptimumStorage::minimize( VectorXi &ipvt, Matrix< Scalar, Dynamic, 1 > &qtf, Matrix< Scalar, Dynamic, 1 > &diag, - int mode, - Scalar factor, - int maxfev, - Scalar ftol, - Scalar xtol, - Scalar gtol, - int nprint + const int mode, + const Scalar factor, + const int maxfev, + const Scalar ftol, + const Scalar xtol, + const Scalar gtol, + const int nprint ) { const int m = fvec.size(), n = x.size(); @@ -115,6 +115,7 @@ int LevenbergMarquardtOptimumStorage::minimize( if (n <= 0 || m < n || ftol < 0. || xtol < 0. || gtol < 0. || maxfev <= 0 || factor <= 0.) goto algo_end; + if (mode == 2) for (j = 0; j < n; ++j) if (diag[j] <= 0.) goto algo_end; -- cgit v1.2.3