slight tuning of optimization

This commit is contained in:
Joachim Schoeberl 2013-02-03 14:43:44 +00:00
parent be7274b29e
commit 1bc41b35a4
2 changed files with 6 additions and 3 deletions

View File

@ -248,7 +248,7 @@ double BFGS (
do do
{ {
// Restart // Restart
// cout << "it " << it << "f = " << f << endl;
if (it % (5 * n) == 0) if (it % (5 * n) == 0)
{ {
@ -400,6 +400,8 @@ double BFGS (
x = x0; x = x0;
} }
// cout << endl;
// (*testout) << "x = " << x << ", x0 = " << x0 << endl; // (*testout) << "x = " << x << ", x0 = " << x0 << endl;
return f; return f;
} }

View File

@ -187,9 +187,10 @@ void lines (Vector & x, // i: initial point of line-search
// it = 100000l; // it = 100000l;
it = 0; it = 0;
// cout << "lin: ";
while (it++ <= par.maxit_linsearch) while (it++ <= par.maxit_linsearch)
{ {
// cout << "i = " << it << " f = " << f << " ";
xneu.Set2 (1, x, alphahat, p); xneu.Set2 (1, x, alphahat, p);
@ -292,7 +293,7 @@ void lines (Vector & x, // i: initial point of line-search
} }
// (*testout) << "linsearch: it = " << it << " ifail = " << ifail << endl; // (*testout) << "linsearch: it = " << it << " ifail = " << ifail << endl;
// cout << endl;
fun.FuncGrad (xneu, g); fun.FuncGrad (xneu, g);