zhangyiss/liblbfgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Make sure that the initial gradients are non-zero.

Browse Source 
- Added a necessary cast.

git-svn-id: file:///home/svnrepos/software/liblbfgs/trunk@12 ecf4c44f-38d1-4fa4-9757-a0b4dd0349fc
This commit is contained in:
naoaki 2008-07-08 04:37:50 +00:00
parent 85faeef0f4
commit 36c6eaa158
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/lbfgs.h
View File

@ -74,6 +74,8 @@ enum {
LBFGSFALSE = 0, LBFGSFALSE = 0,
/** True value. */ /** True value. */
LBFGSTRUE, LBFGSTRUE,
/** */
LBFGS_ALREADY_MINIMIZED,
/** Unknown error. */ /** Unknown error. */
LBFGSERR_UNKNOWNERROR = -1024, LBFGSERR_UNKNOWNERROR = -1024,

11
lib/lbfgs.c
View File

@ -184,7 +184,7 @@ lbfgsfloatval_t* lbfgs_malloc(int n)
#if defined(USE_SSE) && (defined(__SSE__) || defined(__SSE2__)) #if defined(USE_SSE) && (defined(__SSE__) || defined(__SSE2__))
n = round_out_variables(n); n = round_out_variables(n);
#endif/*defined(USE_SSE)*/ #endif/*defined(USE_SSE)*/
return vecalloc(sizeof(lbfgsfloatval_t) * n); return (lbfgsfloatval_t*)vecalloc(sizeof(lbfgsfloatval_t) * n);
} }
void lbfgs_free(lbfgsfloatval_t *x) void lbfgs_free(lbfgsfloatval_t *x)
@ -354,6 +354,15 @@ int lbfgs(
} }
} }
/*
Make sure that the gradients are not zero.
*/
vecnorm(&gnorm, g, n);
if (gnorm == 0.) {
ret = LBFGS_ALREADY_MINIMIZED;
goto lbfgs_exit;
}
/* Compute the initial step: /* Compute the initial step:
step = 1.0 / sqrt(vecdot(d, d, n)) step = 1.0 / sqrt(vecdot(d, d, n))
*/ */