From 457052f6611904c066ffc5cc6b1c0b87ed5cc7d0 Mon Sep 17 00:00:00 2001
From: Theofrastos Mantadelis <theo@herbie.cs.kuleuven.be>
Date: Mon, 17 Jan 2011 12:02:05 +0100
Subject: [PATCH] Corrected a minor ProbLog bug

---
 packages/ProbLog/problog.yap       | 6 ++++--
 packages/ProbLog/problog/ptree.yap | 7 +++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/ProbLog/problog.yap b/packages/ProbLog/problog.yap
index 23ea671bc..cb70ad91d 100644
--- a/packages/ProbLog/problog.yap
+++ b/packages/ProbLog/problog.yap
@@ -2,8 +2,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  $Date: 2010-12-15 11:12:48 +0100 (Wed, 15 Dec 2010) $
-%  $Revision: 5138 $
+%  $Date: 2011-01-16 19:24:10 +0100 (Sun, 16 Jan 2011) $
+%  $Revision: 5260 $
 %
 %  This file is part of ProbLog
 %  http://dtai.cs.kuleuven.be/problog
@@ -521,6 +521,7 @@ init_global_params :-
   problog_define_flag(bdd_result,      problog_flag_validate_file, 'file to store result calculated from BDD', example_bdd_res, bdd, flags:working_file_handler),
   problog_define_flag(bdd_file,        problog_flag_validate_file, 'file for BDD script', example_bdd, bdd, flags:bdd_file_handler),
   problog_define_flag(static_order_file,    problog_flag_validate_file, 'file for BDD static order', example_bdd_order, bdd, flags:working_file_handler),
+  problog_define_flag(map_file,        problog_flag_validate_file,    'the file to output the variable map', map_file, output, flags:working_file_handler),
 %%%%%%%%%%%%
 % montecarlo: recalculate current approximation after N samples
 % montecarlo: write log to this file
@@ -2458,6 +2459,7 @@ montecarlo(Goal,Delta,K,File) :-
 	format(Log,'# goal: ~q~n#delta: ~w~n',[Goal,Delta]),
 	format(Log,'# num_programs  prob   low   high  diff  time~2n',[]),
 	close(Log),
+	timer_reset(monte_carlo),
 	timer_start(monte_carlo),
 	format_if_verbose(user,'search for ~q~n',[Goal]),
 	montecarlo(Goal,Delta,K,0,File,0),
diff --git a/packages/ProbLog/problog/ptree.yap b/packages/ProbLog/problog/ptree.yap
index e11fd1a20..2d8afb1d2 100644
--- a/packages/ProbLog/problog/ptree.yap
+++ b/packages/ProbLog/problog/ptree.yap
@@ -2,8 +2,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  $Date: 2010-12-20 12:35:25 +0100 (Mon, 20 Dec 2010) $
-%  $Revision: 5161 $
+%  $Date: 2011-01-16 19:24:10 +0100 (Sun, 16 Jan 2011) $
+%  $Revision: 5260 $
 %
 %  This file is part of ProbLog
 %  http://dtai.cs.kuleuven.be/problog
@@ -283,8 +283,7 @@
 	problog_define_flag(use_old_trie,    problog_flag_validate_boolean, 'use the old trie 2 trie transformation no nested', true),
 	problog_define_flag(use_dec_trie,    problog_flag_validate_boolean, 'use the decomposition method', false),
   problog_define_flag(deref_terms,     problog_flag_validate_boolean, 'deref BDD terms after last use', false),
-  problog_define_flag(export_map_file, problog_flag_validate_boolean, 'activates export of a variable map file', false, output),
-  problog_define_flag(map_file,        problog_flag_validate_file,    'the file to output the variable map', map_file, output)
+  problog_define_flag(export_map_file, problog_flag_validate_boolean, 'activates export of a variable map file', false, output)
 )).