From d72770a18c9e8f11cfb37d3e73b067ed18aa310a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Fri, 5 Apr 2019 08:55:12 +0100
Subject: [PATCH] lbfgs

---
 packages/ProbLog/problog_lbfgs.yap | 17 +++++++++++------
 packages/yap-lbfgs/yap_lbfgs.c     | 19 ++++++++-----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/packages/ProbLog/problog_lbfgs.yap b/packages/ProbLog/problog_lbfgs.yap
index e7c4fd8e1..8aebc52bc 100644
--- a/packages/ProbLog/problog_lbfgs.yap
+++ b/packages/ProbLog/problog_lbfgs.yap
@@ -825,11 +825,11 @@ user:evaluate(LLH_Training_Queries, X,Grad,N,_,_) :-
 	go( X,Grad, LLs),
 	Error,
 	(writeln(Error), throw(Error) )),
-    length(LLs,NN),
-    V <== array[NN] of LLs,
-    LLH_Training_Queries <== sum(V),
-writeln( LLH_Training_Queries).
-%    sum_list( LLs, LLH_Training_Queries),
+   length(LLs,NN),
+   V <== array[NN] of LLs,
+   SLL <== sum(V),
+    %sum_list( LLs, SLL),
+    LLH_Training_Queries[0] <== SLL.
 
 test :-
     S =.. [f,0-0.9,1-0.8,2-0.6,3-0.7,4-0.5,5-0.4,6-0.7,7-0.2],
@@ -843,7 +843,8 @@ Grad <== array[N] of floats,
 	LL,
 	compute_gradient(Grad, X, Slope,LL),
 	LLs
- ), sum_list( LLs, _LLH_Training_Queries).
+ ), sum_list( LLs, SLL).
+
 
 
 
@@ -862,7 +863,10 @@ compute_gradient( Grad, X, Slope, LL) :-
 	BDD = bdd(_,_,MapList),
 	MapList = [_|_],
 	bind_maplist(MapList, Slope, X),
+%writeln(QueryID:MapList),
 	query_probabilities( BDD, BDDProb),
+	(isnan(BDDProb) -> writeln((nan::QueryID)), fail;true),
+writeln(BDDProb),
 	LL is (BDDProb-QueryProb)*(BDDProb-QueryProb),
     forall(
 	query_gradients(BDD,I,IProb,GradValue), 
@@ -872,6 +876,7 @@ compute_gradient( Grad, X, Slope, LL) :-
 gradient_pair(BDDProb, QueryProb, Grad, GradValue, I, Prob) :-
     G0 <== Grad[I],
     GN is G0-GradValue*Prob*(1-Prob)*2*(QueryProb-BDDProb),
+    (isnan(GN) -> writeln((nan::I)), fail;true),
     Grad[I] <== GN.
 
 wrap( X, Grad, GradCount) :-
diff --git a/packages/yap-lbfgs/yap_lbfgs.c b/packages/yap-lbfgs/yap_lbfgs.c
index 6312e7112..7a7712d85 100644
--- a/packages/yap-lbfgs/yap_lbfgs.c
+++ b/packages/yap-lbfgs/yap_lbfgs.c
@@ -42,13 +42,14 @@ static lbfgsfloatval_t evaluate(void *instance, const lbfgsfloatval_t *x,
                                 const lbfgsfloatval_t step) {
   YAP_Term call;
   YAP_Bool result;
-  lbfgsfloatval_t rc;
+  lbfgsfloatval_t rc=0.0;
   YAP_Term v, t1, t12;
   YAP_Term t[6], t2[2];
 
-  t[0] = v = YAP_MkVarTerm();
-  t1 = YAP_MkIntTerm((YAP_Int)x);
-  t[1] = YAP_MkApplTerm(ffloats, 1, &t1);
+  YAP_Term t_0 = YAP_MkIntTerm((YAP_Int)&rc);
+  t[0] = YAP_MkApplTerm(ffloats, 1, &t_0);
+  YAP_Term t_1 = YAP_MkIntTerm((YAP_Int)x);
+  t[1] = YAP_MkApplTerm(ffloats, 1, &t_1);
   t12 = YAP_MkIntTerm((YAP_Int)g_tmp);
   t[2] = YAP_MkApplTerm(ffloats, 1, &t12);
   t[3] = YAP_MkIntTerm(n);
@@ -70,13 +71,9 @@ static lbfgsfloatval_t evaluate(void *instance, const lbfgsfloatval_t *x,
     // Goal did not succeed
     return FALSE;
   }
-  YAP_Term o;
-  if (YAP_IsIntTerm((o = YAP_GetFromSlot(sl))))
-    rc = YAP_IntOfTerm(o);
-  else
-    rc = YAP_FloatOfTerm(o);
-  YAP_ShutdownGoal(true);
+   YAP_ShutdownGoal(true);
   YAP_RecoverSlots(1, sl);
+  fprintf(stderr,"%gxo\n",rc);
   return rc;
 }
 
@@ -124,7 +121,7 @@ static int progress(void *instance, const lbfgsfloatval_t *local_x,
 
   if (YAP_IsIntTerm(o)) {
     int v = YAP_IntOfTerm(o);
-   YAP_ShutdownGoal(true);
+    YAP_ShutdownGoal(true);
    return (int)v;
   }
   YAP_ShutdownGoal(true);