From 0d23db6b6de9020f756bb7d14c266acbe4f72714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Manuel=20de=20Morais=20Santos=20Costa?=
 <vsc@xato.(none)>
Date: Wed, 11 Nov 2009 12:36:54 +0000
Subject: [PATCH] fix use of rm * when we have lots of examples.

---
 packages/ProbLog/problog_learning.yap | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/ProbLog/problog_learning.yap b/packages/ProbLog/problog_learning.yap
index a121129c5..b8260482a 100644
--- a/packages/ProbLog/problog_learning.yap
+++ b/packages/ProbLog/problog_learning.yap
@@ -648,12 +648,18 @@ init_learning :-
 
 
 delete_all_queries :-
-	learning_flag(query_directory,Directory),
-	atomic_concat(['rm -f ',Directory,'query_*'],Command),
-	(shell(Command) -> true; true),
+	remove_queries,
 	retractall(query_is_similar(_,_)),
 	retractall(query_md5(_,_,_)).
 
+remove_queries :-
+	learning_flag(query_directory,Directory),
+	user:example(ID,_,_),
+	atomic_concat([Directory,'query_',ID],File),
+	delete_file(File),
+	fail.	
+remove_queries.
+
 empty_output_directory :-
 	learning_flag(output_directory,Directory),
 	atomic_concat(['rm -f ',Directory,'log.dat ',
@@ -683,9 +689,9 @@ init_queries :-
 	( % go over all training examples
 	    current_predicate(user:example/3),
 	    user:example(ID,Query,Prob),
-%	    statistics(runtime,[_,T]),
-%	    my_format(3,' training example ~q: ~q ~q~n',[ID,Query,T]),
-	    my_format(3,' training example ~q: ~q~n',[ID,Query]),
+	    statistics(runtime,[_,T]),
+	    my_format(3,' training example ~q: ~q after ~q msec~n',[ID,Query,T]),
+%	    my_format(3,' training example ~q: ~q~n',[ID,Query]),
 	    flush_output(user),
 	    init_one_query(ID,Query,training),
 	    fail; %go to next training example