From f0e95e36ff9bf5827ba122136ba69206a53243c8 Mon Sep 17 00:00:00 2001 From: naoaki Date: Mon, 16 Feb 2009 15:23:18 +0000 Subject: [PATCH] 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 --- lib/lbfgs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/lbfgs.c b/lib/lbfgs.c index a9a3d52..cb2b95d 100644 --- a/lib/lbfgs.c +++ b/lib/lbfgs.c @@ -335,13 +335,11 @@ int lbfgs( } if (param.orthantwise_c != 0.) { switch (param.linesearch) { - case LBFGS_LINESEARCH_MORETHUENTE: - return LBFGSERR_INVALID_LINESEARCH; case LBFGS_LINESEARCH_BACKTRACKING: - case LBFGS_LINESEARCH_BACKTRACKING_STRONG: linesearch = line_search_backtracking_owlqn; break; default: + /* Only the backtracking method is available. */ return LBFGSERR_INVALID_LINESEARCH; } } else {