Do not allow the strong Wolfe condition for OW-LQN.
git-svn-id: file:///home/svnrepos/software/liblbfgs/trunk@52 ecf4c44f-38d1-4fa4-9757-a0b4dd0349fc
This commit is contained in:
parent
662aa854dd
commit
f0e95e36ff
@ -335,13 +335,11 @@ int lbfgs(
|
|||||||
}
|
}
|
||||||
if (param.orthantwise_c != 0.) {
|
if (param.orthantwise_c != 0.) {
|
||||||
switch (param.linesearch) {
|
switch (param.linesearch) {
|
||||||
case LBFGS_LINESEARCH_MORETHUENTE:
|
|
||||||
return LBFGSERR_INVALID_LINESEARCH;
|
|
||||||
case LBFGS_LINESEARCH_BACKTRACKING:
|
case LBFGS_LINESEARCH_BACKTRACKING:
|
||||||
case LBFGS_LINESEARCH_BACKTRACKING_STRONG:
|
|
||||||
linesearch = line_search_backtracking_owlqn;
|
linesearch = line_search_backtracking_owlqn;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
/* Only the backtracking method is available. */
|
||||||
return LBFGSERR_INVALID_LINESEARCH;
|
return LBFGSERR_INVALID_LINESEARCH;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user