only indentation fixes (this eases porting)

This commit is contained in:
Thomas Capricelli 2009-08-23 21:06:57 +02:00
parent feb5af3ede
commit f793dbe45c
2 changed files with 153 additions and 153 deletions

View File

@ -1,5 +1,5 @@
template <typename Scalar>
template <typename Scalar>
void ei_dogleg(int n, const Scalar *r__, int /* lr*/ ,
const Scalar *diag, const Scalar *qtb, Scalar delta, Scalar *x,
Scalar *wa1, Scalar *wa2)
@ -21,7 +21,7 @@ void ei_dogleg(int n, const Scalar *r__, int /* lr*/ ,
/* Function Body */
const Scalar epsmch = epsilon<Scalar>();
/* first, calculate the gauss-newton direction. */
/* first, calculate the gauss-newton direction. */
jj = n * (n + 1) / 2 + 1;
for (k = 1; k <= n; ++k) {
@ -36,7 +36,7 @@ void ei_dogleg(int n, const Scalar *r__, int /* lr*/ ,
for (i = jp1; i <= n; ++i) {
sum += r__[l] * x[i];
++l;
/* L10: */
/* L10: */
}
L20:
temp = r__[jj];
@ -45,10 +45,10 @@ L20:
}
l = j;
for (i = 1; i <= j; ++i) {
/* Computing MAX */
/* Computing MAX */
temp = std::max(temp,ei_abs(r__[l]));
l = l + n - i;
/* L30: */
/* L30: */
}
temp = epsmch * temp;
if (temp == 0.) {
@ -56,15 +56,15 @@ L20:
}
L40:
x[j] = (qtb[j] - sum) / temp;
/* L50: */
/* L50: */
}
/* test whether the gauss-newton direction is acceptable. */
/* test whether the gauss-newton direction is acceptable. */
for (j = 1; j <= n; ++j) {
wa1[j] = 0.;
wa2[j] = diag[j] * x[j];
/* L60: */
/* L60: */
}
qnorm = Map< Matrix< Scalar, Dynamic, 1 > >(&wa2[1],n).stableNorm();
if (qnorm <= delta) {
@ -72,8 +72,8 @@ L40:
return;
}
/* the gauss-newton direction is not acceptable. */
/* next, calculate the scaled gradient direction. */
/* the gauss-newton direction is not acceptable. */
/* next, calculate the scaled gradient direction. */
l = 1;
for (j = 1; j <= n; ++j) {
@ -81,14 +81,14 @@ L40:
for (i = j; i <= n; ++i) {
wa1[i] += r__[l] * temp;
++l;
/* L70: */
/* L70: */
}
wa1[j] /= diag[j];
/* L80: */
/* L80: */
}
/* calculate the norm of the scaled gradient and test for */
/* the special case in which the scaled gradient is zero. */
/* calculate the norm of the scaled gradient and test for */
/* the special case in which the scaled gradient is zero. */
gnorm = Map< Matrix< Scalar, Dynamic, 1 > >(&wa1[1],n).stableNorm();
sgnorm = 0.;
@ -97,12 +97,12 @@ L40:
goto L120;
}
/* calculate the point along the scaled gradient */
/* at which the quadratic is minimized. */
/* calculate the point along the scaled gradient */
/* at which the quadratic is minimized. */
for (j = 1; j <= n; ++j) {
wa1[j] = wa1[j] / gnorm / diag[j];
/* L90: */
/* L90: */
}
l = 1;
for (j = 1; j <= n; ++j) {
@ -110,45 +110,45 @@ L40:
for (i = j; i <= n; ++i) {
sum += r__[l] * wa1[i];
++l;
/* L100: */
/* L100: */
}
wa2[j] = sum;
/* L110: */
/* L110: */
}
temp = Map< Matrix< Scalar, Dynamic, 1 > >(&wa2[1],n).stableNorm();
sgnorm = gnorm / temp / temp;
/* test whether the scaled gradient direction is acceptable. */
/* test whether the scaled gradient direction is acceptable. */
alpha = 0.;
if (sgnorm >= delta) {
goto L120;
}
/* the scaled gradient direction is not acceptable. */
/* finally, calculate the point along the dogleg */
/* at which the quadratic is minimized. */
/* the scaled gradient direction is not acceptable. */
/* finally, calculate the point along the dogleg */
/* at which the quadratic is minimized. */
bnorm = Map< Matrix< Scalar, Dynamic, 1 > >(&qtb[1],n).stableNorm();
temp = bnorm / gnorm * (bnorm / qnorm) * (sgnorm / delta);
/* Computing 2nd power */
/* Computing 2nd power */
temp = temp - delta / qnorm * ei_abs2(sgnorm / delta) + ei_sqrt(ei_abs2(temp - delta / qnorm) + (1.-ei_abs2(delta / qnorm)) * (1.-ei_abs2(sgnorm / delta)));
/* Computing 2nd power */
/* Computing 2nd power */
alpha = delta / qnorm * (1. - ei_abs2(sgnorm / delta)) / temp;
L120:
/* form appropriate convex combination of the gauss-newton */
/* direction and the scaled gradient direction. */
/* form appropriate convex combination of the gauss-newton */
/* direction and the scaled gradient direction. */
temp = (1. - alpha) * std::min(sgnorm,delta);
for (j = 1; j <= n; ++j) {
x[j] = temp * wa1[j] + alpha * x[j];
/* L130: */
/* L130: */
}
/* L140: */
/* L140: */
return;
/* last card of subroutine dogleg. */
/* last card of subroutine dogleg. */
} /* dogleg_ */

View File

@ -31,8 +31,8 @@ void ei_lmpar(
Matrix< Scalar, Dynamic, 1 > wa1(n), wa2(n);
/* compute and store in x the gauss-newton direction. if the */
/* jacobian is rank-deficient, obtain a least squares solution. */
/* compute and store in x the gauss-newton direction. if the */
/* jacobian is rank-deficient, obtain a least squares solution. */
nsing = n-1;
for (j = 0; j < n; ++j) {
@ -56,14 +56,14 @@ void ei_lmpar(
x[l] = wa1[j];
}
/* initialize the iteration counter. */
/* evaluate the function at the origin, and test */
/* for acceptance of the gauss-newton direction. */
/* initialize the iteration counter. */
/* evaluate the function at the origin, and test */
/* for acceptance of the gauss-newton direction. */
iter = 0;
for (j = 0; j < n; ++j) {
wa2[j] = diag[j] * x[j];
/* L70: */
/* L70: */
}
dxnorm = wa2.blueNorm();
fp = dxnorm - delta;
@ -71,9 +71,9 @@ void ei_lmpar(
goto L220;
}
/* if the jacobian is not rank deficient, the newton */
/* step provides a lower bound, parl, for the zero of */
/* the function. otherwise set this bound to zero. */
/* if the jacobian is not rank deficient, the newton */
/* step provides a lower bound, parl, for the zero of */
/* the function. otherwise set this bound to zero. */
parl = 0.;
if (nsing < n-1) {
@ -94,17 +94,17 @@ void ei_lmpar(
parl = fp / delta / temp / temp;
L120:
/* calculate an upper bound, paru, for the zero of the function. */
/* calculate an upper bound, paru, for the zero of the function. */
for (j = 0; j < n; ++j) {
sum = 0.;
for (i = 0; i <= j; ++i) {
sum += r__(i,j) * qtb[i];
/* L130: */
/* L130: */
}
l = ipvt[j]-1;
wa1[j] = sum / diag[l];
/* L140: */
/* L140: */
}
gnorm = wa1.stableNorm();
paru = gnorm / delta;
@ -112,8 +112,8 @@ L120:
paru = dwarf / std::min(delta,Scalar(0.1));
}
/* if the input par lies outside of the interval (parl,paru), */
/* set par to the closer endpoint. */
/* if the input par lies outside of the interval (parl,paru), */
/* set par to the closer endpoint. */
par = std::max(par,parl);
par = std::min(par,paru);
@ -121,46 +121,46 @@ L120:
par = gnorm / dxnorm;
}
/* beginning of an iteration. */
/* beginning of an iteration. */
L150:
++iter;
/* evaluate the function at the current value of par. */
/* evaluate the function at the current value of par. */
if (par == 0.) {
/* Computing MAX */
/* Computing MAX */
par = std::max(dwarf,Scalar(.001) * paru);
}
temp = ei_sqrt(par);
for (j = 0; j < n; ++j) {
wa1[j] = temp * diag[j];
/* L160: */
/* L160: */
}
ei_qrsolv<Scalar>(n, r__.data(), r__.rows(), ipvt.data(), wa1.data(), qtb.data(), x.data(), sdiag.data(), wa2.data());
for (j = 0; j < n; ++j) {
wa2[j] = diag[j] * x[j];
/* L170: */
/* L170: */
}
dxnorm = wa2.blueNorm();
temp = fp;
fp = dxnorm - delta;
/* if the function is small enough, accept the current value */
/* of par. also test for the exceptional cases where parl */
/* is zero or the number of iterations has reached 10. */
/* if the function is small enough, accept the current value */
/* of par. also test for the exceptional cases where parl */
/* is zero or the number of iterations has reached 10. */
if (ei_abs(fp) <= Scalar(0.1) * delta || (parl == 0. && fp <= temp && temp < 0.) ||
iter == 10) {
goto L220;
}
/* compute the newton correction. */
/* compute the newton correction. */
for (j = 0; j < n; ++j) {
l = ipvt[j]-1;
wa1[j] = diag[l] * (wa2[l] / dxnorm);
/* L180: */
/* L180: */
}
for (j = 0; j < n; ++j) {
wa1[j] /= sdiag[j];
@ -172,7 +172,7 @@ L150:
temp = wa1.blueNorm();
parc = fp / delta / temp / temp;
/* depending on the sign of the function, update parl or paru. */
/* depending on the sign of the function, update parl or paru. */
if (fp > 0.) {
parl = std::max(parl,par);
@ -181,24 +181,24 @@ L150:
paru = std::min(paru,par);
}
/* compute an improved estimate for par. */
/* compute an improved estimate for par. */
/* Computing MAX */
/* Computing MAX */
par = std::max(parl,par+parc);
/* end of an iteration. */
/* end of an iteration. */
goto L150;
L220:
/* termination. */
/* termination. */
if (iter == 0) {
par = 0.;
}
return;
/* last card of subroutine lmpar. */
/* last card of subroutine lmpar. */
} /* lmpar_ */