From 4e04e87ab66c57ab5df75034b1cc9faa092b36aa Mon Sep 17 00:00:00 2001
From: Theofrastos Mantadelis <theo@herbie.cs.kuleuven.be>
Date: Mon, 30 Aug 2010 18:12:32 +0200
Subject: [PATCH] Fixed base case bug, db_trie learning comatibility

---
 packages/ProbLog/problog.yap        | 13 ++++++++-----
 packages/ProbLog/problog/tptree.yap | 16 +++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/ProbLog/problog.yap b/packages/ProbLog/problog.yap
index 16bb9f223..e84d63d1a 100644
--- a/packages/ProbLog/problog.yap
+++ b/packages/ProbLog/problog.yap
@@ -2,8 +2,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  $Date: 2010-08-25 15:45:22 +0200 (Wed, 25 Aug 2010) $
-%  $Revision: 4692 $
+%  $Date: 2010-08-30 18:09:17 +0200 (Mon, 30 Aug 2010) $
+%  $Revision: 4728 $
 %
 %  This file is part of ProbLog
 %  http://dtai.cs.kuleuven.be/problog
@@ -1559,7 +1559,8 @@ eval_dnf(OriTrie1, Prob, Status) :-
   % naive method with nested trie support but not loops
   ((problog_flag(use_naive_trie, true); (problog_flag(use_old_trie, true), nb_getval(problog_nested_tries, true))) ->
     statistics(walltime, _),
-    atomic_concat([BDDFile, '_naive'], BDDFile_naive),
+%     atomic_concat([BDDFile, '_naive'], BDDFile_naive),
+    BDDFile = BDDFile_naive,
     nested_ptree_to_BDD_script(Trie, BDDFile_naive, BDDParFile),
     statistics(walltime, [_, ScriptGenerationTime_naive]),
     problog_var_set(bdd_script_time(naive), ScriptGenerationTime_naive),
@@ -1593,7 +1594,8 @@ eval_dnf(OriTrie1, Prob, Status) :-
     (problog_flag(use_db_trie, true) ->
       tries:trie_db_opt_min_prefix(MinPrefix),
       statistics(walltime, _),
-      atomic_concat([BDDFile, '_builtin_', OptLevel], BDDFile_builtin),
+%       atomic_concat([BDDFile, '_builtin_', OptLevel], BDDFile_builtin),
+      BDDFile = BDDFile_builtin,
       (nb_getval(problog_nested_tries, false) ->
         trie_to_bdd_trie(Trie, DBTrie, BDDFile_builtin, OptLevel, BDDParFile)
       ;
@@ -1631,7 +1633,8 @@ eval_dnf(OriTrie1, Prob, Status) :-
   % decomposition method
   (problog_flag(use_dec_trie, true) ->
     statistics(walltime, _),
-    atomic_concat([BDDFile, '_dec'], BDDFile_dec),
+%     atomic_concat([BDDFile, '_dec'], BDDFile_dec),
+    BDDFile = BDDFile_dec,
     ptree_decomposition(Trie, BDDFile_dec, BDDParFile),
     statistics(walltime, [_, ScriptGenerationTime_dec]),
     problog_var_set(bdd_script_time(dec), ScriptGenerationTime_dec),
diff --git a/packages/ProbLog/problog/tptree.yap b/packages/ProbLog/problog/tptree.yap
index 7142546c0..fa3ec46fd 100644
--- a/packages/ProbLog/problog/tptree.yap
+++ b/packages/ProbLog/problog/tptree.yap
@@ -2,8 +2,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  $Date: 2010-08-26 14:27:24 +0200 (Thu, 26 Aug 2010) $
-%  $Revision: 4711 $
+%  $Date: 2010-08-30 18:09:17 +0200 (Mon, 30 Aug 2010) $
+%  $Revision: 4728 $
 %
 %  This file is part of ProbLog
 %  http://dtai.cs.kuleuven.be/problog
@@ -1253,7 +1253,8 @@ get_variable(R, R).
 
 trie_to_bdd_trie(A, B, OutputFile, OptimizationLevel, FileParam):-
   trie_to_depth_breadth_trie(A, B, LL, OptimizationLevel),
-  (atomic_concat('L', InterStep, LL) ->
+  (islabel(LL) ->
+    atomic_concat('L', InterStep, LL),
     retractall(deref(_,_)),
     (problog_flag(deref_terms, true) ->
       asserta(deref(LL,no)),
@@ -1289,8 +1290,13 @@ trie_to_bdd_trie(A, B, OutputFile, OptimizationLevel, FileParam):-
     write(1), nl,
     write(0), nl,
     write(1), nl,
-    get_var_name(LL, NLL),
-    write('L1 = '),write(NLL),nl,
+    (LL = not(ID) ->
+      get_var_name(ID, NLL),
+      write('L1 = ~'), write(NLL),nl
+    ;
+      get_var_name(LL, NLL),
+      write('L1 = '), write(NLL),nl
+    ),
     write('L1'), nl,
     told
   ).