提交 1400d465 编写于 作者: S stevenj

tweaks to verbose output

darcs-hash:20080820011424-c8de0-28d7e81e47e3daf7171ca30df12748148f93c65c.gz
上级 a39181c3
...@@ -263,7 +263,7 @@ nlopt_result mma_minimize(int n, nlopt_func f, void *f_data, ...@@ -263,7 +263,7 @@ nlopt_result mma_minimize(int n, nlopt_func f, void *f_data,
if (mma_verbose) if (mma_verbose)
printf("MMA inner iteration: rho -> %g\n", rho); printf("MMA inner iteration: rho -> %g\n", rho);
for (i = 0; i < MIN(mma_verbose, m); ++i) for (i = 0; i < MIN(mma_verbose, m); ++i)
printf(" rhoc[%d] -> %g\n", i,rhoc[i]); printf(" MMA rhoc[%d] -> %g\n", i,rhoc[i]);
} }
if (nlopt_stop_ftol(stop, fcur, fprev)) if (nlopt_stop_ftol(stop, fcur, fprev))
...@@ -279,7 +279,7 @@ nlopt_result mma_minimize(int n, nlopt_func f, void *f_data, ...@@ -279,7 +279,7 @@ nlopt_result mma_minimize(int n, nlopt_func f, void *f_data,
for (i = 0; i < m; ++i) for (i = 0; i < m; ++i)
rhoc[i] = MAX(0.1 * rhoc[i], MMA_RHOMIN); rhoc[i] = MAX(0.1 * rhoc[i], MMA_RHOMIN);
for (i = 0; i < MIN(mma_verbose, m); ++i) for (i = 0; i < MIN(mma_verbose, m); ++i)
printf(" rhoc[%d] -> %g\n", i, rhoc[i]); printf(" MMA rhoc[%d] -> %g\n", i, rhoc[i]);
if (k > 1) { if (k > 1) {
for (j = 0; j < n; ++j) { for (j = 0; j < n; ++j) {
double dx2 = (xcur[j]-xprev[j]) * (xprev[j]-xprevprev[j]); double dx2 = (xcur[j]-xprev[j]) * (xprev[j]-xprevprev[j]);
...@@ -291,7 +291,7 @@ nlopt_result mma_minimize(int n, nlopt_func f, void *f_data, ...@@ -291,7 +291,7 @@ nlopt_result mma_minimize(int n, nlopt_func f, void *f_data,
} }
} }
for (j = 0; j < MIN(mma_verbose, n); ++j) for (j = 0; j < MIN(mma_verbose, n); ++j)
printf(" sigma[%d] -> %g\n", printf(" MMA sigma[%d] -> %g\n",
j, sigma[j]); j, sigma[j]);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册