small

- do not call goal expansion on meta-calls (that is done by undef).
- docs updates
- fix init code

packages/ProbLog/problog/completion.yap

@@ -291,7 +291,7 @@ propagate_evidence(InterpretationID,Query_Type) :-
         % iterate over all evidence atoms
 	forall(user:known(InterpretationID,Atom,Value),
 	       (
-		catch( rounder_compute_reachable_atoms(Atom,InterpretationID,Success), _, fail),
+		catch( grounder_compute_reachable_atoms(Atom,InterpretationID,Success), _, fail),
 		(
 		    (Success==true; Value==false)
 		->
@@ -385,7 +385,6 @@ propagate_evidence(InterpretationID,Query_Type) :-
 print_script_per_cluster([],_,_,Seen_Atoms,Seen_Atoms,Cluster_IDs,Cluster_IDs).
 print_script_per_cluster([Refs|T],InterpretationID,Cluster_ID,Old_Seen_Atoms,Seen_Atoms,Old_Cluster_IDs,Cluster_IDs) :-
 	create_bdd_file_name(InterpretationID,Cluster_ID,File_Name),
-	%trace,
 	once(print_simplecudd_script(Refs,File_Name,This_Seen_Atoms)),
 	New_Seen_Atoms is Old_Seen_Atoms+This_Seen_Atoms,
 	Next_Cluster_ID is Cluster_ID+1,

packages/ProbLog/problog/ptree.yap

@@ -261,7 +261,6 @@
 :- style_check(all).
 :- yap_flag(unknown,error).
 
-
 % this is a test to determine whether YAP provides the needed trie library
 :- initialization(
         (       predicate_property(trie_disable_hash, imported_from(tries)) ->

packages/ProbLog/problog_learning.yap

@@ -730,8 +730,8 @@ update_query(QueryID,Symbol,What_To_Update) :-
 	  problog_flag(sigmoid_slope,Slope),
 	  problog_dir(PD),
 	  ((What_To_Update=all;query_is_similar(_,QueryID)) -> Method='g' ; Method='l'),
-	  atomic_concat([PD,
-			 '/problogbdd',
+      convert_filename_to_problog_path('problogbdd', ProblogBDD),
+	  atomic_concat([ProblogBDD,
 			 ' -i "', Probabilities_File, '"',
 			 ' -l "', Query_Directory,'/query_',QueryID, '"',
 			 ' -m ', Method,

packages/ProbLog/problog_lfi.yap

@@ -1,3 +1,4 @@
+
 %%% -*- Mode: Prolog; -*-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1180,3 +1181,11 @@ init_logger :-
 
 :- initialization(init_flags).
 :- initialization(init_logger).
+
+%:- spy em_one_iteration.
+
+
+%:- initialization(do_learning(100) ).
+
+                
+