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

coherency for scalar typename : use "Scalar" everywhere

Browse Source
This commit is contained in:
Thomas Capricelli 2009-08-20 21:10:28 +02:00
parent df98e66019
commit a84dc9a5c1
11 changed files with 151 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unsupported/Eigen/src/NonLinear/chkder.h
View File

@ -4,18 +4,18 @@
/* Table of constant values */ /* Table of constant values */
template<typename T> template<typename Scalar>
void chkder_template(int m, int n, const T *x, void chkder_template(int m, int n, const Scalar *x,
T *fvec, T *fjac, int ldfjac, T *xp, Scalar *fvec, Scalar *fjac, int ldfjac, Scalar *xp,
T *fvecp, int mode, T *err) Scalar *fvecp, int mode, Scalar *err)
{ {
/* System generated locals */ /* System generated locals */
int fjac_dim1, fjac_offset, i__1, i__2; int fjac_dim1, fjac_offset, i__1, i__2;
/* Local variables */ /* Local variables */
int i__, j; int i__, j;
T eps, epsf, temp; Scalar eps, epsf, temp;
T epslog; Scalar epslog;
/* Parameter adjustments */ /* Parameter adjustments */
--err; --err;
@ -29,7 +29,7 @@ void chkder_template(int m, int n, const T *x,
/* Function Body */ /* Function Body */
eps = ei_sqrt(epsilon<T>()); eps = ei_sqrt(epsilon<Scalar>());
if (mode == 2) { if (mode == 2) {
goto L20; goto L20;
@ -52,7 +52,7 @@ L20:
/* mode = 2. */ /* mode = 2. */
epsf = chkder_factor * epsilon<T>(); epsf = chkder_factor * epsilon<Scalar>();
epslog = chkder_log10e * log(eps); epslog = chkder_log10e * log(eps);
i__1 = m; i__1 = m;
for (i__ = 1; i__ <= i__1; ++i__) { for (i__ = 1; i__ <= i__1; ++i__) {
@ -83,7 +83,7 @@ L20:
fabs(fvecp[i__])); fabs(fvecp[i__]));
} }
err[i__] = 1.; err[i__] = 1.;
if (temp > epsilon<T>() && temp < eps) { if (temp > epsilon<Scalar>() && temp < eps) {
err[i__] = (chkder_log10e * log(temp) - epslog) / epslog; err[i__] = (chkder_log10e * log(temp) - epslog) / epslog;
} }
if (temp >= eps) { if (temp >= eps) {

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

@ -1,34 +1,33 @@
template<typename T> template<typename Scalar>
int hybrd_template(minpack_func_nn fcn, void *p, int n, T *x, T * int hybrd_template(minpack_func_nn fcn, void *p, int n, Scalar *x, Scalar *
fvec, T xtol, int maxfev, int ml, int mu, fvec, Scalar xtol, int maxfev, int ml, int mu,
T epsfcn, T *diag, int mode, T Scalar epsfcn, Scalar *diag, int mode, Scalar factor, int nprint, int *nfev, Scalar *
factor, int nprint, int *nfev, T * fjac, int ldfjac, Scalar *r__, int lr, Scalar *qtf,
fjac, int ldfjac, T *r__, int lr, T *qtf, Scalar *wa1, Scalar *wa2, Scalar *wa3, Scalar *wa4)
T *wa1, T *wa2, T *wa3, T *wa4)
{ {
/* Initialized data */ /* Initialized data */
/* System generated locals */ /* System generated locals */
int fjac_dim1, fjac_offset, i__1, i__2; int fjac_dim1, fjac_offset, i__1, i__2;
T d__1, d__2; Scalar d__1, d__2;
/* Local variables */ /* Local variables */
int i__, j, l, jm1, iwa[1]; int i__, j, l, jm1, iwa[1];
T sum; Scalar sum;
int sing; int sing;
int iter; int iter;
T temp; Scalar temp;
int msum, iflag; int msum, iflag;
T delta; Scalar delta;
int jeval; int jeval;
int ncsuc; int ncsuc;
T ratio; Scalar ratio;
T fnorm; Scalar fnorm;
T pnorm, xnorm, fnorm1; Scalar pnorm, xnorm, fnorm1;
int nslow1, nslow2; int nslow1, nslow2;
int ncfail; int ncfail;
T actred, prered; Scalar actred, prered;
int info; int info;
/* Parameter adjustments */ /* Parameter adjustments */
@ -77,7 +76,7 @@ L20:
if (iflag < 0) { if (iflag < 0) {
goto L300; goto L300;
} }
fnorm = ei_enorm<T>(n, &fvec[1]); fnorm = ei_enorm<Scalar>(n, &fvec[1]);
/* determine the number of calls to fcn needed to compute */ /* determine the number of calls to fcn needed to compute */
/* the jacobian matrix. */ /* the jacobian matrix. */
@ -140,7 +139,7 @@ L50:
wa3[j] = diag[j] * x[j]; wa3[j] = diag[j] * x[j];
/* L60: */ /* L60: */
} }
xnorm = ei_enorm<T>(n, &wa3[1]); xnorm = ei_enorm<Scalar>(n, &wa3[1]);
delta = factor * xnorm; delta = factor * xnorm;
if (delta == 0.) { if (delta == 0.) {
delta = factor; delta = factor;
@ -250,7 +249,7 @@ L190:
wa3[j] = diag[j] * wa1[j]; wa3[j] = diag[j] * wa1[j];
/* L200: */ /* L200: */
} }
pnorm = ei_enorm<T>(n, &wa3[1]); pnorm = ei_enorm<Scalar>(n, &wa3[1]);
/* on the first iteration, adjust the initial step bound. */ /* on the first iteration, adjust the initial step bound. */
@ -265,7 +264,7 @@ L190:
if (iflag < 0) { if (iflag < 0) {
goto L300; goto L300;
} }
fnorm1 = ei_enorm<T>(n, &wa4[1]); fnorm1 = ei_enorm<Scalar>(n, &wa4[1]);
/* compute the scaled actual reduction. */ /* compute the scaled actual reduction. */
@ -291,7 +290,7 @@ L190:
wa3[i__] = qtf[i__] + sum; wa3[i__] = qtf[i__] + sum;
/* L220: */ /* L220: */
} }
temp = ei_enorm<T>(n, &wa3[1]); temp = ei_enorm<Scalar>(n, &wa3[1]);
prered = 0.; prered = 0.;
if (temp < fnorm) { if (temp < fnorm) {
/* Computing 2nd power */ /* Computing 2nd power */
@ -344,7 +343,7 @@ L240:
fvec[j] = wa4[j]; fvec[j] = wa4[j];
/* L250: */ /* L250: */
} }
xnorm = ei_enorm<T>(n, &wa2[1]); xnorm = ei_enorm<Scalar>(n, &wa2[1]);
fnorm = fnorm1; fnorm = fnorm1;
++iter; ++iter;
L260: L260:
@ -378,7 +377,7 @@ L260:
} }
/* Computing MAX */ /* Computing MAX */
d__1 = p1 * delta; d__1 = p1 * delta;
if (p1 * max(d__1,pnorm) <= epsilon<T>() * xnorm) { if (p1 * max(d__1,pnorm) <= epsilon<Scalar>() * xnorm) {
info = 3; info = 3;
} }
if (nslow2 == 5) { if (nslow2 == 5) {

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

@ -1,20 +1,20 @@
template<typename T> template<typename Scalar>
int hybrd1_template(minpack_func_nn fcn, void *p, int n, T *x, T * int hybrd1_template(minpack_func_nn fcn, void *p, int n, Scalar *x, Scalar *
fvec, T tol, T *wa, int lwa) fvec, Scalar tol, Scalar *wa, int lwa)
{ {
/* Initialized data */ /* Initialized data */
const T factor = 100.; const Scalar factor = 100.;
/* System generated locals */ /* System generated locals */
int i__1; int i__1;
/* Local variables */ /* Local variables */
int j, ml, lr, mu, mode, nfev; int j, ml, lr, mu, mode, nfev;
T xtol; Scalar xtol;
int index; int index;
T epsfcn; Scalar epsfcn;
int maxfev, nprint; int maxfev, nprint;
int info; int info;

44
unsupported/Eigen/src/NonLinear/hybrj.h
View File

@ -1,34 +1,34 @@
template<typename T> template<typename Scalar>
int hybrj_template(minpack_funcder_nn fcn, void *p, int n, T *x, T * int hybrj_template(minpack_funcder_nn fcn, void *p, int n, Scalar *x, Scalar *
fvec, T *fjac, int ldfjac, T xtol, int fvec, Scalar *fjac, int ldfjac, Scalar xtol, int
maxfev, T *diag, int mode, T factor, int maxfev, Scalar *diag, int mode, Scalar factor, int
nprint, int *nfev, int *njev, T *r__, nprint, int *nfev, int *njev, Scalar *r__,
int lr, T *qtf, T *wa1, T *wa2, int lr, Scalar *qtf, Scalar *wa1, Scalar *wa2,
T *wa3, T *wa4) Scalar *wa3, Scalar *wa4)
{ {
/* Initialized data */ /* Initialized data */
/* System generated locals */ /* System generated locals */
int fjac_dim1, fjac_offset, i__1, i__2; int fjac_dim1, fjac_offset, i__1, i__2;
T d__1, d__2; Scalar d__1, d__2;
/* Local variables */ /* Local variables */
int i__, j, l, jm1, iwa[1]; int i__, j, l, jm1, iwa[1];
T sum; Scalar sum;
int sing; int sing;
int iter; int iter;
T temp; Scalar temp;
int iflag; int iflag;
T delta; Scalar delta;
int jeval; int jeval;
int ncsuc; int ncsuc;
T ratio; Scalar ratio;
T fnorm; Scalar fnorm;
T pnorm, xnorm, fnorm1; Scalar pnorm, xnorm, fnorm1;
int nslow1, nslow2; int nslow1, nslow2;
int ncfail; int ncfail;
T actred, prered; Scalar actred, prered;
int info; int info;
/* Parameter adjustments */ /* Parameter adjustments */
@ -78,7 +78,7 @@ L20:
if (iflag < 0) { if (iflag < 0) {
goto L300; goto L300;
} }
fnorm = ei_enorm<T>(n, &fvec[1]); fnorm = ei_enorm<Scalar>(n, &fvec[1]);
/* initialize iteration counter and monitors. */ /* initialize iteration counter and monitors. */
@ -133,7 +133,7 @@ L50:
wa3[j] = diag[j] * x[j]; wa3[j] = diag[j] * x[j];
/* L60: */ /* L60: */
} }
xnorm = ei_enorm<T>(n, &wa3[1]); xnorm = ei_enorm<Scalar>(n, &wa3[1]);
delta = factor * xnorm; delta = factor * xnorm;
if (delta == 0.) { if (delta == 0.) {
delta = factor; delta = factor;
@ -243,7 +243,7 @@ L190:
wa3[j] = diag[j] * wa1[j]; wa3[j] = diag[j] * wa1[j];
/* L200: */ /* L200: */
} }
pnorm = ei_enorm<T>(n, &wa3[1]); pnorm = ei_enorm<Scalar>(n, &wa3[1]);
/* on the first iteration, adjust the initial step bound. */ /* on the first iteration, adjust the initial step bound. */
@ -258,7 +258,7 @@ L190:
if (iflag < 0) { if (iflag < 0) {
goto L300; goto L300;
} }
fnorm1 = ei_enorm<T>(n, &wa4[1]); fnorm1 = ei_enorm<Scalar>(n, &wa4[1]);
/* compute the scaled actual reduction. */ /* compute the scaled actual reduction. */
@ -284,7 +284,7 @@ L190:
wa3[i__] = qtf[i__] + sum; wa3[i__] = qtf[i__] + sum;
/* L220: */ /* L220: */
} }
temp = ei_enorm<T>(n, &wa3[1]); temp = ei_enorm<Scalar>(n, &wa3[1]);
prered = 0.; prered = 0.;
if (temp < fnorm) { if (temp < fnorm) {
/* Computing 2nd power */ /* Computing 2nd power */
@ -337,7 +337,7 @@ L240:
fvec[j] = wa4[j]; fvec[j] = wa4[j];
/* L250: */ /* L250: */
} }
xnorm = ei_enorm<T>(n, &wa2[1]); xnorm = ei_enorm<Scalar>(n, &wa2[1]);
fnorm = fnorm1; fnorm = fnorm1;
++iter; ++iter;
L260: L260:
@ -371,7 +371,7 @@ L260:
} }
/* Computing MAX */ /* Computing MAX */
d__1 = p1 * delta; d__1 = p1 * delta;
if (p1 * max(d__1,pnorm) <= epsilon<T>() * xnorm) { if (p1 * max(d__1,pnorm) <= epsilon<Scalar>() * xnorm) {
info = 3; info = 3;
} }
if (nslow2 == 5) { if (nslow2 == 5) {

12
unsupported/Eigen/src/NonLinear/hybrj1.h
View File

@ -1,19 +1,19 @@
template<typename T> template<typename Scalar>
int hybrj1_template(minpack_funcder_nn fcn, void *p, int n, T *x, T * int hybrj1_template(minpack_funcder_nn fcn, void *p, int n, Scalar *x, Scalar *
fvec, T *fjac, int ldfjac, T tol, fvec, Scalar *fjac, int ldfjac, Scalar tol,
T *wa, int lwa) Scalar *wa, int lwa)
{ {
/* Initialized data */ /* Initialized data */
const T factor = 100.; const Scalar factor = 100.;
/* System generated locals */ /* System generated locals */
int fjac_dim1, fjac_offset, i__1; int fjac_dim1, fjac_offset, i__1;
/* Local variables */ /* Local variables */
int j, lr, mode, nfev, njev; int j, lr, mode, nfev, njev;
T xtol; Scalar xtol;
int maxfev, nprint; int maxfev, nprint;
int info; int info;

44
unsupported/Eigen/src/NonLinear/lmder.h
View File

@ -1,27 +1,27 @@
template<typename T> template<typename Scalar>
int lmder_template(minpack_funcder_mn fcn, void *p, int m, int n, T *x, int lmder_template(minpack_funcder_mn fcn, void *p, int m, int n, Scalar *x,
T *fvec, T *fjac, int ldfjac, T ftol, Scalar *fvec, Scalar *fjac, int ldfjac, Scalar ftol,
T xtol, T gtol, int maxfev, T * Scalar xtol, Scalar gtol, int maxfev, Scalar *
diag, int mode, T factor, int nprint, diag, int mode, Scalar factor, int nprint,
int *nfev, int *njev, int *ipvt, T *qtf, int *nfev, int *njev, int *ipvt, Scalar *qtf,
T *wa1, T *wa2, T *wa3, T *wa4) Scalar *wa1, Scalar *wa2, Scalar *wa3, Scalar *wa4)
{ {
/* Initialized data */ /* Initialized data */
/* System generated locals */ /* System generated locals */
int fjac_dim1, fjac_offset, i__1, i__2; int fjac_dim1, fjac_offset, i__1, i__2;
T d__1, d__2, d__3; Scalar d__1, d__2, d__3;
/* Local variables */ /* Local variables */
int i__, j, l; int i__, j, l;
T par, sum; Scalar par, sum;
int iter; int iter;
T temp, temp1, temp2; Scalar temp, temp1, temp2;
int iflag; int iflag;
T delta; Scalar delta;
T ratio; Scalar ratio;
T fnorm, gnorm, pnorm, xnorm, fnorm1, actred, dirder, prered; Scalar fnorm, gnorm, pnorm, xnorm, fnorm1, actred, dirder, prered;
int info; int info;
/* Parameter adjustments */ /* Parameter adjustments */
@ -71,7 +71,7 @@ L20:
if (iflag < 0) { if (iflag < 0) {
goto L300; goto L300;
} }
fnorm = ei_enorm<T>(m, &fvec[1]); fnorm = ei_enorm<Scalar>(m, &fvec[1]);
/* initialize levenberg-marquardt parameter and iteration counter. */ /* initialize levenberg-marquardt parameter and iteration counter. */
@ -136,7 +136,7 @@ L60:
wa3[j] = diag[j] * x[j]; wa3[j] = diag[j] * x[j];
/* L70: */ /* L70: */
} }
xnorm = ei_enorm<T>(n, &wa3[1]); xnorm = ei_enorm<Scalar>(n, &wa3[1]);
delta = factor * xnorm; delta = factor * xnorm;
if (delta == 0.) { if (delta == 0.) {
delta = factor; delta = factor;
@ -242,7 +242,7 @@ L200:
wa3[j] = diag[j] * wa1[j]; wa3[j] = diag[j] * wa1[j];
/* L210: */ /* L210: */
} }
pnorm = ei_enorm<T>(n, &wa3[1]); pnorm = ei_enorm<Scalar>(n, &wa3[1]);
/* on the first iteration, adjust the initial step bound. */ /* on the first iteration, adjust the initial step bound. */
@ -257,7 +257,7 @@ L200:
if (iflag < 0) { if (iflag < 0) {
goto L300; goto L300;
} }
fnorm1 = ei_enorm<T>(m, &wa4[1]); fnorm1 = ei_enorm<Scalar>(m, &wa4[1]);
/* compute the scaled actual reduction. */ /* compute the scaled actual reduction. */
@ -283,7 +283,7 @@ L200:
} }
/* L230: */ /* L230: */
} }
temp1 = ei_enorm<T>(n, &wa3[1]) / fnorm; temp1 = ei_enorm<Scalar>(n, &wa3[1]) / fnorm;
temp2 = sqrt(par) * pnorm / fnorm; temp2 = sqrt(par) * pnorm / fnorm;
/* Computing 2nd power */ /* Computing 2nd power */
d__1 = temp1; d__1 = temp1;
@ -351,7 +351,7 @@ L260:
fvec[i__] = wa4[i__]; fvec[i__] = wa4[i__];
/* L280: */ /* L280: */
} }
xnorm = ei_enorm<T>(n, &wa2[1]); xnorm = ei_enorm<Scalar>(n, &wa2[1]);
fnorm = fnorm1; fnorm = fnorm1;
++iter; ++iter;
L290: L290:
@ -377,13 +377,13 @@ L290:
if (*nfev >= maxfev) { if (*nfev >= maxfev) {
info = 5; info = 5;
} }
if (fabs(actred) <= epsilon<T>() && prered <= epsilon<T>() && p5 * ratio <= 1.) { if (fabs(actred) <= epsilon<Scalar>() && prered <= epsilon<Scalar>() && p5 * ratio <= 1.) {
info = 6; info = 6;
} }
if (delta <= epsilon<T>() * xnorm) { if (delta <= epsilon<Scalar>() * xnorm) {
info = 7; info = 7;
} }
if (gnorm <= epsilon<T>()) { if (gnorm <= epsilon<Scalar>()) {
info = 8; info = 8;
} }
if (info != 0) { if (info != 0) {

13
unsupported/Eigen/src/NonLinear/lmder1.h
View File

@ -1,20 +1,19 @@
template<typename Scalar>
template<typename T> int lmder1_template(minpack_funcder_mn fcn, void *p, int m, int n, Scalar *x,
int lmder1_template(minpack_funcder_mn fcn, void *p, int m, int n, T *x, Scalar *fvec, Scalar *fjac, int ldfjac, Scalar tol,
T *fvec, T *fjac, int ldfjac, T tol, int *ipvt, Scalar *wa, int lwa)
int *ipvt, T *wa, int lwa)
{ {
/* Initialized data */ /* Initialized data */
const T factor = 100.; const Scalar factor = 100.;
/* System generated locals */ /* System generated locals */
int fjac_dim1, fjac_offset; int fjac_dim1, fjac_offset;
/* Local variables */ /* Local variables */
int mode, nfev, njev; int mode, nfev, njev;
T ftol, gtol, xtol; Scalar ftol, gtol, xtol;
int maxfev, nprint; int maxfev, nprint;
int info; int info;

47
unsupported/Eigen/src/NonLinear/lmdif.h
View File

@ -1,30 +1,29 @@
template<typename Scalar>
template<typename T> int lmdif_template(minpack_func_mn fcn, void *p, int m, int n, Scalar *x,
int lmdif_template(minpack_func_mn fcn, void *p, int m, int n, T *x, Scalar *fvec, Scalar ftol, Scalar xtol, Scalar gtol,
T *fvec, T ftol, T xtol, T int maxfev, Scalar epsfcn, Scalar *diag, int
gtol, int maxfev, T epsfcn, T *diag, int mode, Scalar factor, int nprint, int *
mode, T factor, int nprint, int * nfev, Scalar *fjac, int ldfjac, int *ipvt, Scalar *
nfev, T *fjac, int ldfjac, int *ipvt, T * qtf, Scalar *wa1, Scalar *wa2, Scalar *wa3, Scalar *
qtf, T *wa1, T *wa2, T *wa3, T *
wa4) wa4)
{ {
/* Initialized data */ /* Initialized data */
/* System generated locals */ /* System generated locals */
int fjac_dim1, fjac_offset, i__1, i__2; int fjac_dim1, fjac_offset, i__1, i__2;
T d__1, d__2, d__3; Scalar d__1, d__2, d__3;
/* Local variables */ /* Local variables */
int i__, j, l; int i__, j, l;
T par, sum; Scalar par, sum;
int iter; int iter;
T temp, temp1, temp2; Scalar temp, temp1, temp2;
int iflag; int iflag;
T delta; Scalar delta;
T ratio; Scalar ratio;
T fnorm, gnorm; Scalar fnorm, gnorm;
T pnorm, xnorm, fnorm1, actred, dirder, prered; Scalar pnorm, xnorm, fnorm1, actred, dirder, prered;
int info; int info;
/* Parameter adjustments */ /* Parameter adjustments */
@ -73,7 +72,7 @@ L20:
if (iflag < 0) { if (iflag < 0) {
goto L300; goto L300;
} }
fnorm = ei_enorm<T>(m, &fvec[1]); fnorm = ei_enorm<Scalar>(m, &fvec[1]);
/* initialize levenberg-marquardt parameter and iteration counter. */ /* initialize levenberg-marquardt parameter and iteration counter. */
@ -139,7 +138,7 @@ L60:
wa3[j] = diag[j] * x[j]; wa3[j] = diag[j] * x[j];
/* L70: */ /* L70: */
} }
xnorm = ei_enorm<T>(n, &wa3[1]); xnorm = ei_enorm<Scalar>(n, &wa3[1]);
delta = factor * xnorm; delta = factor * xnorm;
if (delta == 0.) { if (delta == 0.) {
delta = factor; delta = factor;
@ -245,7 +244,7 @@ L200:
wa3[j] = diag[j] * wa1[j]; wa3[j] = diag[j] * wa1[j];
/* L210: */ /* L210: */
} }
pnorm = ei_enorm<T>(n, &wa3[1]); pnorm = ei_enorm<Scalar>(n, &wa3[1]);
/* on the first iteration, adjust the initial step bound. */ /* on the first iteration, adjust the initial step bound. */
@ -260,7 +259,7 @@ L200:
if (iflag < 0) { if (iflag < 0) {
goto L300; goto L300;
} }
fnorm1 = ei_enorm<T>(m, &wa4[1]); fnorm1 = ei_enorm<Scalar>(m, &wa4[1]);
/* compute the scaled actual reduction. */ /* compute the scaled actual reduction. */
@ -286,7 +285,7 @@ L200:
} }
/* L230: */ /* L230: */
} }
temp1 = ei_enorm<T>(n, &wa3[1]) / fnorm; temp1 = ei_enorm<Scalar>(n, &wa3[1]) / fnorm;
temp2 = sqrt(par) * pnorm / fnorm; temp2 = sqrt(par) * pnorm / fnorm;
/* Computing 2nd power */ /* Computing 2nd power */
d__1 = temp1; d__1 = temp1;
@ -354,7 +353,7 @@ L260:
fvec[i__] = wa4[i__]; fvec[i__] = wa4[i__];
/* L280: */ /* L280: */
} }
xnorm = ei_enorm<T>(n, &wa2[1]); xnorm = ei_enorm<Scalar>(n, &wa2[1]);
fnorm = fnorm1; fnorm = fnorm1;
++iter; ++iter;
L290: L290:
@ -380,13 +379,13 @@ L290:
if (*nfev >= maxfev) { if (*nfev >= maxfev) {
info = 5; info = 5;
} }
if (fabs(actred) <= epsilon<T>() && prered <= epsilon<T>() && p5 * ratio <= 1.) { if (fabs(actred) <= epsilon<Scalar>() && prered <= epsilon<Scalar>() && p5 * ratio <= 1.) {
info = 6; info = 6;
} }
if (delta <= epsilon<T>() * xnorm) { if (delta <= epsilon<Scalar>() * xnorm) {
info = 7; info = 7;
} }
if (gnorm <= epsilon<T>()) { if (gnorm <= epsilon<Scalar>()) {
info = 8; info = 8;
} }
if (info != 0) { if (info != 0) {

14
unsupported/Eigen/src/NonLinear/lmdif1.h
View File

@ -1,16 +1,16 @@
template<typename T> template<typename Scalar>
int lmdif1_template(minpack_func_mn fcn, void *p, int m, int n, T *x, int lmdif1_template(minpack_func_mn fcn, void *p, int m, int n, Scalar *x,
T *fvec, T tol, int *iwa, Scalar *fvec, Scalar tol, int *iwa,
T *wa, int lwa) Scalar *wa, int lwa)
{ {
/* Initialized data */ /* Initialized data */
const T factor = 100.; const Scalar factor = 100.;
int mp5n, mode, nfev; int mp5n, mode, nfev;
T ftol, gtol, xtol; Scalar ftol, gtol, xtol;
T epsfcn; Scalar epsfcn;
int maxfev, nprint; int maxfev, nprint;
int info; int info;

46
unsupported/Eigen/src/NonLinear/lmstr.h
View File

@ -1,28 +1,28 @@
template<typename T> template<typename Scalar>
int lmstr_template(minpack_funcderstr_mn fcn, void *p, int m, int n, T *x, int lmstr_template(minpack_funcderstr_mn fcn, void *p, int m, int n, Scalar *x,
T *fvec, T *fjac, int ldfjac, T ftol, Scalar *fvec, Scalar *fjac, int ldfjac, Scalar ftol,
T xtol, T gtol, int maxfev, T * Scalar xtol, Scalar gtol, int maxfev, Scalar *
diag, int mode, T factor, int nprint, diag, int mode, Scalar factor, int nprint,
int *nfev, int *njev, int *ipvt, T *qtf, int *nfev, int *njev, int *ipvt, Scalar *qtf,
T *wa1, T *wa2, T *wa3, T *wa4) Scalar *wa1, Scalar *wa2, Scalar *wa3, Scalar *wa4)
{ {
/* Initialized data */ /* Initialized data */
/* System generated locals */ /* System generated locals */
int fjac_dim1, fjac_offset, i__1, i__2; int fjac_dim1, fjac_offset, i__1, i__2;
T d__1, d__2, d__3; Scalar d__1, d__2, d__3;
/* Local variables */ /* Local variables */
int i__, j, l; int i__, j, l;
T par, sum; Scalar par, sum;
int sing; int sing;
int iter; int iter;
T temp, temp1, temp2; Scalar temp, temp1, temp2;
int iflag; int iflag;
T delta; Scalar delta;
T ratio; Scalar ratio;
T fnorm, gnorm, pnorm, xnorm, fnorm1, actred, dirder, prered; Scalar fnorm, gnorm, pnorm, xnorm, fnorm1, actred, dirder, prered;
int info; int info;
/* Parameter adjustments */ /* Parameter adjustments */
@ -72,7 +72,7 @@ L20:
if (iflag < 0) { if (iflag < 0) {
goto L340; goto L340;
} }
fnorm = ei_enorm<T>(m, &fvec[1]); fnorm = ei_enorm<Scalar>(m, &fvec[1]);
/* initialize levenberg-marquardt parameter and iteration counter. */ /* initialize levenberg-marquardt parameter and iteration counter. */
@ -136,7 +136,7 @@ L40:
sing = TRUE_; sing = TRUE_;
} }
ipvt[j] = j; ipvt[j] = j;
wa2[j] = ei_enorm<T>(j, &fjac[j * fjac_dim1 + 1]); wa2[j] = ei_enorm<Scalar>(j, &fjac[j * fjac_dim1 + 1]);
/* L80: */ /* L80: */
} }
if (! sing) { if (! sing) {
@ -194,7 +194,7 @@ L150:
wa3[j] = diag[j] * x[j]; wa3[j] = diag[j] * x[j];
/* L160: */ /* L160: */
} }
xnorm = ei_enorm<T>(n, &wa3[1]); xnorm = ei_enorm<Scalar>(n, &wa3[1]);
delta = factor * xnorm; delta = factor * xnorm;
if (delta == 0.) { if (delta == 0.) {
delta = factor; delta = factor;
@ -269,7 +269,7 @@ L240:
wa3[j] = diag[j] * wa1[j]; wa3[j] = diag[j] * wa1[j];
/* L250: */ /* L250: */
} }
pnorm = ei_enorm<T>(n, &wa3[1]); pnorm = ei_enorm<Scalar>(n, &wa3[1]);
/* on the first iteration, adjust the initial step bound. */ /* on the first iteration, adjust the initial step bound. */
@ -284,7 +284,7 @@ L240:
if (iflag < 0) { if (iflag < 0) {
goto L340; goto L340;
} }
fnorm1 = ei_enorm<T>(m, &wa4[1]); fnorm1 = ei_enorm<Scalar>(m, &wa4[1]);
/* compute the scaled actual reduction. */ /* compute the scaled actual reduction. */
@ -310,7 +310,7 @@ L240:
} }
/* L270: */ /* L270: */
} }
temp1 = ei_enorm<T>(n, &wa3[1]) / fnorm; temp1 = ei_enorm<Scalar>(n, &wa3[1]) / fnorm;
temp2 = sqrt(par) * pnorm / fnorm; temp2 = sqrt(par) * pnorm / fnorm;
/* Computing 2nd power */ /* Computing 2nd power */
d__1 = temp1; d__1 = temp1;
@ -378,7 +378,7 @@ L300:
fvec[i__] = wa4[i__]; fvec[i__] = wa4[i__];
/* L320: */ /* L320: */
} }
xnorm = ei_enorm<T>(n, &wa2[1]); xnorm = ei_enorm<Scalar>(n, &wa2[1]);
fnorm = fnorm1; fnorm = fnorm1;
++iter; ++iter;
L330: L330:
@ -404,13 +404,13 @@ L330:
if (*nfev >= maxfev) { if (*nfev >= maxfev) {
info = 5; info = 5;
} }
if (abs(actred) <= epsilon<T>() && prered <= epsilon<T>() && p5 * ratio <= 1.) { if (abs(actred) <= epsilon<Scalar>() && prered <= epsilon<Scalar>() && p5 * ratio <= 1.) {
info = 6; info = 6;
} }
if (delta <= epsilon<T>() * xnorm) { if (delta <= epsilon<Scalar>() * xnorm) {
info = 7; info = 7;
} }
if (gnorm <= epsilon<T>()) { if (gnorm <= epsilon<Scalar>()) {
info = 8; info = 8;
} }
if (info != 0) { if (info != 0) {

12
unsupported/Eigen/src/NonLinear/lmstr1.h
View File

@ -1,19 +1,19 @@
template<typename T> template<typename Scalar>
int lmstr1_template(minpack_funcderstr_mn fcn, void *p, int m, int n, T *x, int lmstr1_template(minpack_funcderstr_mn fcn, void *p, int m, int n, Scalar *x,
T *fvec, T *fjac, int ldfjac, T tol, Scalar *fvec, Scalar *fjac, int ldfjac, Scalar tol,
int *ipvt, T *wa, int lwa) int *ipvt, Scalar *wa, int lwa)
{ {
/* Initialized data */ /* Initialized data */
const T factor = 100.; const Scalar factor = 100.;
/* System generated locals */ /* System generated locals */
int fjac_dim1, fjac_offset; int fjac_dim1, fjac_offset;
/* Local variables */ /* Local variables */
int mode, nfev, njev; int mode, nfev, njev;
T ftol, gtol, xtol; Scalar ftol, gtol, xtol;
int maxfev, nprint; int maxfev, nprint;
int info; int info;