- A patch from Kevin S. Van Horn to fix a bug in error checking.

- Updated the copyright year with 2010. git-svn-id: file:///home/svnrepos/software/liblbfgs/trunk@62 ecf4c44f-38d1-4fa4-9757-a0b4dd0349fc
2010-01-13 07:28:37 +00:00
parent 3c3ca1bb5b
commit 2b9f6b92c4
3 changed files with 3 additions and 3 deletions
--- a/lib/lbfgs.c
+++ b/lib/lbfgs.c
@@ -312,7 +312,7 @@ int lbfgs(
    if (param.ftol < 0.) {
        return LBFGSERR_INVALID_FTOL;
    }
-    if (param.linesearch == LBFGS_LINESEARCH_BACKTRACKING_WOLFE &&
+    if (param.linesearch == LBFGS_LINESEARCH_BACKTRACKING_WOLFE ||
        param.linesearch == LBFGS_LINESEARCH_BACKTRACKING_STRONG_WOLFE) {
        if (param.wolfe <= param.ftol || 1. <= param.wolfe) {
            return LBFGSERR_INVALID_WOLFE;