diff --git a/COPYING b/COPYING index 6377dc8..406cbe2 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ The MIT License Copyright (c) 1990 Jorge Nocedal -Copyright (c) 2007-2009 Naoaki Okazaki +Copyright (c) 2007-2010 Naoaki Okazaki Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/README b/README index c896497..b4ce951 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ libLBFGS: C library of limited-memory BFGS (L-BFGS) Copyright (c) 1990, Jorge Nocedal - Copyright (c) 2007-2009, Naoaki Okazaki + Copyright (c) 2007-2010, Naoaki Okazaki ========================================================================= 1. Introduction diff --git a/lib/lbfgs.c b/lib/lbfgs.c index dc065e8..7e59c2d 100644 --- 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;