diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make safe for overflow

Browse Source
This commit is contained in:
Vítor Santos Costa 2013-10-08 13:05:08 +01:00
parent 70d864b13d
commit 6ec98fbcbd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/yap-lbfgs/yap_lbfgs.c
View File

@ -37,9 +37,8 @@ int n; // the size of the parameter vecto
lbfgsfloatval_t *x; // pointer to the parameter vector x[0],...,x[n-1] lbfgsfloatval_t *x; // pointer to the parameter vector x[0],...,x[n-1]
lbfgsfloatval_t *g; // pointer to the gradient vector g[0],...,g[n-1] lbfgsfloatval_t *g; // pointer to the gradient vector g[0],...,g[n-1]
lbfgs_parameter_t param; // the parameters used for lbfgs lbfgs_parameter_t param; // the parameters used for lbfgs
char buffer [2048]; // this buffer is used for creating the atoms to call
YAP_Functor fcall3, fprogress8, fmod2; YAP_Functor fcall3, fprogress8;
static lbfgsfloatval_t evaluate( static lbfgsfloatval_t evaluate(
void *instance, void *instance,
@ -106,6 +105,7 @@ static int progress(
{ {
YAP_Term call; YAP_Term call;
YAP_Bool result; YAP_Bool result;
YAP_Int s1;
YAP_Term t[8]; YAP_Term t[8];
t[0] = YAP_MkFloatTerm(fx); t[0] = YAP_MkFloatTerm(fx);
@ -118,11 +118,14 @@ static int progress(
t[7] = YAP_MkVarTerm(); t[7] = YAP_MkVarTerm();
call = YAP_MkApplTerm( fprogress8, 8, t); call = YAP_MkApplTerm( fprogress8, 8, t);
s1 = YAP_InitSlot(call);
optimizer_status=OPTIMIZER_STATUS_CB_PROGRESS; optimizer_status=OPTIMIZER_STATUS_CB_PROGRESS;
result=YAP_CallProlog(call); result=YAP_CallProlog(call);
optimizer_status=OPTIMIZER_STATUS_RUNNING; optimizer_status=OPTIMIZER_STATUS_RUNNING;
call = YAP_GetFromSlot( s1 );
if (result==FALSE) { if (result==FALSE) {
printf("ERROR: Calling the progress call back function in YAP.\n"); printf("ERROR: Calling the progress call back function in YAP.\n");
// Goal did not succeed // Goal did not succeed
@ -558,7 +561,6 @@ void init_lbfgs_predicates( void )
{ {
fcall3 = YAP_MkFunctor(YAP_LookupAtom("$lbfgs_callback_evaluate"), 3); fcall3 = YAP_MkFunctor(YAP_LookupAtom("$lbfgs_callback_evaluate"), 3);
fprogress8 = YAP_MkFunctor(YAP_LookupAtom("$lbfgs_callback_progress"), 8); fprogress8 = YAP_MkFunctor(YAP_LookupAtom("$lbfgs_callback_progress"), 8);
fmod2 = YAP_MkFunctor(YAP_LookupAtom(":"), 2);
//Initialize the parameters for the L-BFGS optimization. //Initialize the parameters for the L-BFGS optimization.
lbfgs_parameter_init(&param); lbfgs_parameter_init(&param);