smallStuff

packages/ProbLog/CMakeLists.txt

@@ -4,6 +4,7 @@ set (PROGRAMS
   problog_lfi.yap 
   dtproblog.yap 
   aproblog.yap 
+  problog_lbfgs.yap
   problog_learning.yap
   problog_learning_lbdd.yap
   )

packages/ProbLog/problog.yap

@@ -517,13 +517,14 @@ every 5th iteration only.
 % directory where simplecudd executable is located
 % automatically set during loading -- assumes it is in /usr/local/bin or same place where YAP has
 % been installed.)
+
 :- getcwd(PD0),
 	atom_concat(PD0, '../../bin', PD),
 	set_problog_path(PD).
 
 :- PD = '/usr/local/bin',
 	set_problog_path(PD).
-
+%:-     stop_low_level_trace.
 
 
 %%%%%%%%%%%%
@@ -626,6 +627,7 @@ every 5th iteration only.
 
 
 
+
 problog_dir(PD):- problog_path(PD).
 
 %%%%%%%%%%%%%%%%%%%%%%%%

packages/ProbLog/problog/flags.yap

@@ -218,7 +218,7 @@
 :- use_module(gflags).
 :- use_module(os).
 :- use_module(logger).
-:- use_module(library(system), [file_exists/1, delete_file/1]).
+:- use_module(library(system), [file_exists/1, delete_file/1,file_property/2]).
 
 
 /** @defgroup ProbLogMiscellaneous ProbLog Miscellaneous Predicates

packages/ProbLog/problog/ptree.yap

@@ -265,7 +265,7 @@
 :- initialization(
         (       predicate_property(trie_disable_hash, imported_from(_M)) ->
                 trie_disable_hash
-        ;       print_message(warning,'The predicate tries:trie_disable_hash/0 does not exist. Please update trie library.')
+        ; true %    stop_low_level_trace,  print_message(warning,'The predicate trie_disable_hash/0 does not exist. Please update trie library.')
         )
 ).
 
@@ -276,7 +276,7 @@
 :- initialization((
 	problog_define_flag(use_db_trie,     problog_flag_validate_boolean, 'use the builtin trie 2 trie transformation', false),
 	problog_define_flag(db_trie_opt_lvl, problog_flag_validate_integer, 'optimization level for the trie 2 trie transformation', 0),
-	problog_define_flag(compare_opt_lvl, problog_flag_validate_boolean, 'comparison mode for optimization level', false),
+	problog_define_flag(compare_opt_lvl, problog_flag_validate_boolean, 'comparison mode for optimizatione level', false),
 	problog_define_flag(db_min_prefix,   problog_flag_validate_integer, 'minimum size of prefix for dbtrie to optimize', 2),
 	problog_define_flag(use_naive_trie,  problog_flag_validate_boolean, 'use the naive algorithm to generate bdd scripts', false),
 	problog_define_flag(use_old_trie,    problog_flag_validate_boolean, 'use the old trie 2 trie transformation no nested', true),

packages/ProbLog/problog_lbfgs.yap

@@ -581,7 +581,8 @@ bdd_input_file(Filename) :-
 	concat_path_with_filename(Dir,'input.txt',Filename).
 
 init_one_query(QueryID,Query,_Type) :-
-%	format_learning(3,' ~q example ~q: ~q~n',[Type,QueryID,Query]),
+writeln(init_one_query(QueryID,Query,_Type)),
+    %	format_learning(3,' ~q example ~q: ~q~n',[Type,QueryID,Query]),
 
         %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	% if BDD file does not exist, call ProbLog
@@ -592,13 +593,15 @@ init_one_query(QueryID,Query,_Type) :-
 	 format_learning(3,' Reuse existing BDD ~q~n~n',[QueryID])
 	 ;
 	 b_setval(problog_required_keep_ground_ids,false),
+
 	 (QueryID mod 100 =:= 0 -> writeln(QueryID) ; true),
-	  problog_flag(init_method,(Query,N,Bdd,graph2bdd(X,Y,N,Bdd))),
+
+	 problog_flag(init_method,(Query,N,Bdd,G)),
 	  Query =.. [_,X,Y]
 	  ->
 	  Bdd = bdd(Dir, Tree, MapList),
 	  (
-	      graph2bdd(X,Y,N,Bdd)
+	      G
 	  ->
 	  rb_new(H0),
 	  maplist_to_hash(MapList, H0, Hash),
@@ -608,8 +611,9 @@ init_one_query(QueryID,Query,_Type) :-
 	  % Grad=[]
 	  ),
 		write('.'),
-	  recordz(QueryID,bdd(Dir, Grad, MapList),_)
-	 ;
+		recordz(QueryID,bdd(Dir, Grad, MapList),_)
+	 ).
+/*	 ;
 	  problog_flag(init_method,(Query,NOf,Bdd,problog_kbest_as_bdd(Call,NOf,Bdd))) ->
 	  b_setval(problog_required_keep_ground_ids,false),
 	  rb_new(H0),
@@ -624,20 +628,20 @@ init_one_query(QueryID,Query,_Type) :-
 	  tree_to_grad(Tree, Hash, [], Grad),
 	  recordz(QueryID,bdd(Dir, Grad, MapList),_)
 	 ;
-	  problog_flag(init_method,(Query,NOf,Bdd,Call)) ->
+	 
+	 problog_flag(init_method,(Query,NOf,Bdd,_Call)) ,
+	 Query = gene(X,Y),
 	  b_setval(problog_required_keep_ground_ids,false),
 	  rb_new(H0),
 	  Bdd = bdd(Dir, Tree, MapList),
-%	  trace,
-	  problog:Call,
+	 user:graph2bdd(X,Y,1,Bdd),
 	  maplist_to_hash(MapList, H0, Hash),
 	  Tree \= [],
 	  %put_code(0'.),
 	  tree_to_grad(Tree, Hash, [], Grad),
-	  recordz(QueryID,bdd(Dir, Grad, MapList),_)
-	).
-
+	  recordz(QueryID,bdd(Dir, Grad, MapList),_).
 
+*/
 
 
 %========================================================================