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

fix

Browse Source
This commit is contained in:
Vitor Santos Costa 2018-09-29 12:51:06 +01:00
parent 990a86512d
commit 724681dde8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ static lbfgsfloatval_t evaluate(
if (result==FALSE) { if (result==FALSE) {
printf("ERROR: the evaluate call failed in YAP.\n"); printf("ERROR: the evaluate call failed in YAP.\n");
// Goal did not succeed // Goal did not succeed
YAP_ShutdownGoal( TRUE ); YAP_ShutdownGoal( false );
return FALSE; return FALSE;
} }
@ -90,7 +90,7 @@ static lbfgsfloatval_t evaluate(
} }
YAP_ShutdownGoal( TRUE ); YAP_ShutdownGoal( false );
return rc; return rc;
} }
@ -112,7 +112,7 @@ static int progress(
YAP_Bool result; YAP_Bool result;
YAP_Int s1; YAP_Int s1;
YAP_Term t[9],t2[2], v; YAP_Term t[10],t2[2], v;
t[0] = YAP_MkFloatTerm(fx); t[0] = YAP_MkFloatTerm(fx);
t[1] = YAP_MkIntTerm((YAP_Int)local_x); t[1] = YAP_MkIntTerm((YAP_Int)local_x);
t[1] = YAP_MkApplTerm(ffloats, 1, t+1); t[1] = YAP_MkApplTerm(ffloats, 1, t+1);
@ -137,21 +137,19 @@ static int progress(
//optimizer_status=OPTIMIZER_STATUS_RUNNING; //optimizer_status=OPTIMIZER_STATUS_RUNNING;
YAP_Term o = YAP_GetFromSlot( s1 ); YAP_Term o = YAP_GetFromSlot( s1 );
YAP_ShutdownGoal( false );
if (result==FALSE) { if (result==FALSE) {
printf("ERROR: the progress call failed in YAP.\n"); printf("ERROR: the progress call failed in YAP.\n");
// Goal did not succeed // Goal did not succeed
YAP_ShutdownGoal( TRUE );
return -1; return -1;
} }
if (YAP_IsIntTerm(o)) { if (YAP_IsIntTerm(o)) {
int v = YAP_IntOfTerm(o); int v = YAP_IntOfTerm(o);
//YAP_ShutdownGoal( TRUE );
return (int)v; return (int)v;
} }
YAP_ShutdownGoal( TRUE );
fprintf(stderr, "ERROR: The progress call back function did not return an integer as last argument\n"); fprintf(stderr, "ERROR: The progress call back function did not return an integer as last argument\n");
return 1; return 1;
} }