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

use math function adapted to the Scalar type instead of hardcoding float or

Browse Source 
double
This commit is contained in:
Thomas Capricelli 2009-08-21 00:04:41 +02:00
parent d05af200a5
commit 054652b789
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ void ei_chkder(
{ {
const Scalar eps = ei_sqrt(epsilon<Scalar>()); const Scalar eps = ei_sqrt(epsilon<Scalar>());
const Scalar epsf = chkder_factor * epsilon<Scalar>(); const Scalar epsf = chkder_factor * epsilon<Scalar>();
const Scalar epslog = chkder_log10e * log(eps); const Scalar epslog = chkder_log10e * ei_log(eps);
Scalar temp; Scalar temp;
int i,j; int i,j;
@ -52,7 +52,7 @@ void ei_chkder(
} }
err[i] = 1.; err[i] = 1.;
if (temp > epsilon<Scalar>() && temp < eps) { if (temp > epsilon<Scalar>() && temp < eps) {
err[i] = (chkder_log10e * log(temp) - epslog) / epslog; err[i] = (chkder_log10e * ei_log(temp) - epslog) / epslog;
} }
if (temp >= eps) { if (temp >= eps) {
err[i] = 0.; err[i] = 0.;

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

@ -295,7 +295,7 @@ L230:
++ncsuc; ++ncsuc;
if (ratio >= p5 || ncsuc > 1) /* Computing MAX */ if (ratio >= p5 || ncsuc > 1) /* Computing MAX */
delta = max(delta, pnorm / p5); delta = max(delta, pnorm / p5);
if (fabs(ratio - 1.) <= p1) { if (ei_abs(ratio - 1.) <= p1) {
delta = pnorm / p5; delta = pnorm / p5;
} }
L240: L240:

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

@ -289,7 +289,7 @@ L230:
++ncsuc; ++ncsuc;
if (ratio >= p5 || ncsuc > 1) /* Computing MAX */ if (ratio >= p5 || ncsuc > 1) /* Computing MAX */
delta = max(delta, pnorm / p5); delta = max(delta, pnorm / p5);
if (fabs(ratio - 1.) <= p1) { if (ei_abs(ratio - 1.) <= p1) {
delta = pnorm / p5; delta = pnorm / p5;
} }
L240: L240:

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

@ -182,7 +182,7 @@ L120:
/* L140: */ /* L140: */
} }
/* Computing MAX */ /* Computing MAX */
gnorm = max(gnorm, fabs(sum / wa2[l])); gnorm = max(gnorm, ei_abs(sum / wa2[l]));
L150: L150:
/* L160: */ /* L160: */
; ;
@ -325,13 +325,13 @@ L290:
/* tests for convergence. */ /* tests for convergence. */
if (fabs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1.) { if (ei_abs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1.) {
info = 1; info = 1;
} }
if (delta <= xtol * xnorm) { if (delta <= xtol * xnorm) {
info = 2; info = 2;
} }
if (fabs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1. && info if (ei_abs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1. && info
== 2) { == 2) {
info = 3; info = 3;
} }
@ -344,7 +344,7 @@ L290:
if (*nfev >= maxfev) { if (*nfev >= maxfev) {
info = 5; info = 5;
} }
if (fabs(actred) <= epsilon<Scalar>() && prered <= epsilon<Scalar>() && p5 * ratio <= 1.) { if (ei_abs(actred) <= epsilon<Scalar>() && prered <= epsilon<Scalar>() && p5 * ratio <= 1.) {
info = 6; info = 6;
} }
if (delta <= epsilon<Scalar>() * xnorm) { if (delta <= epsilon<Scalar>() * xnorm) {

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

@ -184,7 +184,7 @@ L120:
/* L140: */ /* L140: */
} }
/* Computing MAX */ /* Computing MAX */
gnorm = max(gnorm, fabs(sum / wa2[l])); gnorm = max(gnorm, ei_abs(sum / wa2[l]));
L150: L150:
/* L160: */ /* L160: */
; ;
@ -327,13 +327,13 @@ L290:
/* tests for convergence. */ /* tests for convergence. */
if (fabs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1.) { if (ei_abs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1.) {
info = 1; info = 1;
} }
if (delta <= xtol * xnorm) { if (delta <= xtol * xnorm) {
info = 2; info = 2;
} }
if (fabs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1. && info if (ei_abs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1. && info
== 2) { == 2) {
info = 3; info = 3;
} }
@ -346,7 +346,7 @@ L290:
if (*nfev >= maxfev) { if (*nfev >= maxfev) {
info = 5; info = 5;
} }
if (fabs(actred) <= epsilon<Scalar>() && prered <= epsilon<Scalar>() && p5 * ratio <= 1.) { if (ei_abs(actred) <= epsilon<Scalar>() && prered <= epsilon<Scalar>() && p5 * ratio <= 1.) {
info = 6; info = 6;
} }
if (delta <= epsilon<Scalar>() * xnorm) { if (delta <= epsilon<Scalar>() * xnorm) {

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

@ -206,7 +206,7 @@ L170:
/* L180: */ /* L180: */
} }
/* Computing MAX */ /* Computing MAX */
gnorm = max(gnorm, abs(sum/wa2[l])); gnorm = max(gnorm, ei_abs(sum/wa2[l]));
L190: L190:
/* L200: */ /* L200: */
; ;
@ -350,13 +350,13 @@ L330:
/* tests for convergence. */ /* tests for convergence. */
if (abs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1.) { if (ei_abs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1.) {
info = 1; info = 1;
} }
if (delta <= xtol * xnorm) { if (delta <= xtol * xnorm) {
info = 2; info = 2;
} }
if (abs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1. && info if (ei_abs(actred) <= ftol && prered <= ftol && p5 * ratio <= 1. && info
== 2) { == 2) {
info = 3; info = 3;
} }
@ -369,7 +369,7 @@ L330:
if (*nfev >= maxfev) { if (*nfev >= maxfev) {
info = 5; info = 5;
} }
if (abs(actred) <= epsilon<Scalar>() && prered <= epsilon<Scalar>() && p5 * ratio <= 1.) { if (ei_abs(actred) <= epsilon<Scalar>() && prered <= epsilon<Scalar>() && p5 * ratio <= 1.) {
info = 6; info = 6;
} }
if (delta <= epsilon<Scalar>() * xnorm) { if (delta <= epsilon<Scalar>() * xnorm) {