Merge branch 'github.com/master'

Conflicts:
	Makefile.in

packages/CLPBN/horus/BayesBall.cpp

@@ -1,4 +1,8 @@
+#if __ANDROID__
+#define assert(P)
+#else
 #include <cassert>
+#endif
 
 #include "BayesBall.h"
 

packages/CLPBN/horus/BayesBallGraph.cpp

@@ -1,4 +1,9 @@
+
+#if __ANDROID__
+#define assert(P)
+#else
 #include <cassert>
+#endif
 
 #include <iostream>
 #include <fstream>

packages/CLPBN/horus/HorusYap.cpp

@@ -551,7 +551,7 @@ fillSolutionList (const std::vector<Params>& results)
       YAP_Term belief  = YAP_MkFloatTerm (beliefs[j]);
       queryBeliefsL    = YAP_MkPairTerm (belief, queryBeliefsL);
       list             = YAP_GetFromSlot (sl);
-      YAP_RecoverSlots (1);
+      YAP_RecoverSlots (1, sl);
     }
     list = YAP_MkPairTerm (queryBeliefsL, list);
   }