ProbLog Versioning System

packages/ProbLog/problog.yap

@@ -2,8 +2,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  $Date: 2010-09-30 14:48:30 +0200 (Thu, 30 Sep 2010) $
+%  $Date: 2010-10-05 18:15:57 +0200 (Tue, 05 Oct 2010) $
-%  $Revision: 4859 $
+%  $Revision: 4876 $
 %
 %  This file is part of ProbLog
 %  http://dtai.cs.kuleuven.be/problog
@@ -505,14 +505,6 @@ init_global_params :-
   problog_define_flag(mc_logfile,      problog_flag_validate_file, 'logfile for montecarlo', 'log.txt', mcmc, flags:working_file_handler),
   check_existance('problogbdd').
 
-check_existance(FileName):-
-  convert_filename_to_problog_path(FileName, Path),
-  catch(file_exists(Path), _, fail).
-check_existance(FileName):-
-  problog_path(PD),
-  write(user_error, 'WARNING: Can not find file: '), write(user_error, FileName),
-  write(user_error, ', please place file in problog path: '), write(user_error, PD), nl(user_error).
-
 % parameter initialization to be called after returning to user's directory:
 :- initialization(init_global_params).
 
@@ -3139,4 +3131,3 @@ user:term_expansion(Term,ExpandedTerm) :-
 	prolog_load_context(module,Mod),
 	problog:term_expansion_intern(Term,Mod,ExpandedTerm).
 
-

packages/ProbLog/problog/os.yap

@@ -2,8 +2,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  $Date: 2010-09-30 16:05:52 +0200 (Thu, 30 Sep 2010) $
+%  $Date: 2010-10-05 18:15:57 +0200 (Tue, 05 Oct 2010) $
-%  $Revision: 4863 $
+%  $Revision: 4876 $
 %
 %  This file is part of ProbLog
 %  http://dtai.cs.kuleuven.be/problog
@@ -213,6 +213,7 @@
                convert_filename_to_problog_path/2,
                concat_path_with_filename/3,
                split_path_file/3,
+               check_existance/1,
                calc_md5/2]).
 
 
@@ -316,3 +317,11 @@ split_path_file(PathFile, Path, File):-
 	\+ memberchk(PathSeperatorName, FileName),
 	!.
 %	(Path = '' ; atomic_concat(_, PathSeperator, Path)).
+
+check_existance(FileName):-
+  convert_filename_to_problog_path(FileName, Path),
+  catch(file_exists(Path), _, fail).
+check_existance(FileName):-
+  problog_path(PD),
+  write(user_error, 'WARNING: Can not find file: '), write(user_error, FileName),
+  write(user_error, ', please place file in problog path: '), write(user_error, PD), nl(user_error).

packages/ProbLog/problog/print.yap

@@ -2,8 +2,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  $Date: 2010-09-28 21:04:43 +0200 (Tue, 28 Sep 2010) $
+%  $Date: 2010-10-05 18:15:57 +0200 (Tue, 05 Oct 2010) $
-%  $Revision: 4838 $
+%  $Revision: 4876 $
 %
 %  This file is part of ProbLog
 %  http://dtai.cs.kuleuven.be/problog
@@ -226,10 +226,13 @@
 
 % load library modules
 :- use_module(library(lists), [member/2]).
+:- use_module(library(system), [directory_files/2]).
 
 % load our own modules
 :- use_module(flags).
 :- use_module(variables).
+:- use_module(os, [check_existance/1, convert_filename_to_problog_path/2]).
+:- use_module(version_control, [get_version/3]).
 
 
 % size, line_char, line_char_bold
@@ -296,10 +299,11 @@ make_column_format([HC|TC], [HS|TS], Format, Acc):-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 problog_help :-
-  format('~2nProbLog inference currently offers the following inference methods:~n',[]),
+  print_version,
+  format('~nProbLog inference currently offers the following inference methods:~n',[]),
   show_inference,
   problog:problog_path(PD),
-  format('~nProblog directory: ~q~n',[PD]),
+  format('~nProbLog directory: ~q~n',[PD]),
   format('~nThe following global parameters are available:~n',[]),
   problog_flags,
   print_sep_line,
@@ -310,6 +314,30 @@ problog_help :-
   nl,
   flush_output.
 
+print_version :-
+  nl,
+  print_group_line('Version Information'),
+  check_existance('problog.yap'),
+  convert_filename_to_problog_path('problog.yap', Path),
+  get_version(Path, Version, Revision),
+  format('~w~35+ Last Modified at:~w~65+Revision:~w~n', ['problog.yap', Version, Revision]),
+  convert_filename_to_problog_path('problog', ProblogPath),
+  directory_files(ProblogPath, ProblogFiles),
+  print_version(ProblogFiles),
+  print_sep_line.
+
+print_version([]).
+print_version([H|T]):-
+  atom_concat('.', _, H), !,
+  print_version(T).
+print_version([H|T]):-
+  atom_concat('problog/', H, FileName),
+  convert_filename_to_problog_path(FileName, FilePath),
+  get_version(FilePath, Version, Revision),
+  format('~w~35+ Last Modified at:~w~65+Revision:~w~n', [FileName, Version, Revision]),
+  print_version(T).
+
+
 show_inference :-
   format('~n',[]),
   print_sep_line,

packages/ProbLog/problog/version_control.yap

@@ -0,0 +1,241 @@
+%%% -*- Mode: Prolog; -*-
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  $Date: 2010-10-05 18:15:57 +0200 (Tue, 05 Oct 2010) $
+%  $Revision: 4876 $
+%
+%  This file is part of ProbLog
+%  http://dtai.cs.kuleuven.be/problog
+%
+%  ProbLog was developed at Katholieke Universiteit Leuven
+%
+%  Copyright 2008, 2009, 2010
+%  Katholieke Universiteit Leuven
+%
+%  Main authors of this file:
+%  Theofrastos Mantadelis
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Artistic License 2.0
+%
+% Copyright (c) 2000-2006, The Perl Foundation.
+%
+% Everyone is permitted to copy and distribute verbatim copies of this
+% license document, but changing it is not allowed.  Preamble
+%
+% This license establishes the terms under which a given free software
+% Package may be copied, modified, distributed, and/or
+% redistributed. The intent is that the Copyright Holder maintains some
+% artistic control over the development of that Package while still
+% keeping the Package available as open source and free software.
+%
+% You are always permitted to make arrangements wholly outside of this
+% license directly with the Copyright Holder of a given Package. If the
+% terms of this license do not permit the full use that you propose to
+% make of the Package, you should contact the Copyright Holder and seek
+% a different licensing arrangement.  Definitions
+%
+% "Copyright Holder" means the individual(s) or organization(s) named in
+% the copyright notice for the entire Package.
+%
+% "Contributor" means any party that has contributed code or other
+% material to the Package, in accordance with the Copyright Holder's
+% procedures.
+%
+% "You" and "your" means any person who would like to copy, distribute,
+% or modify the Package.
+%
+% "Package" means the collection of files distributed by the Copyright
+% Holder, and derivatives of that collection and/or of those files. A
+% given Package may consist of either the Standard Version, or a
+% Modified Version.
+%
+% "Distribute" means providing a copy of the Package or making it
+% accessible to anyone else, or in the case of a company or
+% organization, to others outside of your company or organization.
+%
+% "Distributor Fee" means any fee that you charge for Distributing this
+% Package or providing support for this Package to another party. It
+% does not mean licensing fees.
+%
+% "Standard Version" refers to the Package if it has not been modified,
+% or has been modified only in ways explicitly requested by the
+% Copyright Holder.
+%
+% "Modified Version" means the Package, if it has been changed, and such
+% changes were not explicitly requested by the Copyright Holder.
+%
+% "Original License" means this Artistic License as Distributed with the
+% Standard Version of the Package, in its current version or as it may
+% be modified by The Perl Foundation in the future.
+%
+% "Source" form means the source code, documentation source, and
+% configuration files for the Package.
+%
+% "Compiled" form means the compiled bytecode, object code, binary, or
+% any other form resulting from mechanical transformation or translation
+% of the Source form.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Permission for Use and Modification Without Distribution
+%
+% (1) You are permitted to use the Standard Version and create and use
+% Modified Versions for any purpose without restriction, provided that
+% you do not Distribute the Modified Version.
+%
+% Permissions for Redistribution of the Standard Version
+%
+% (2) You may Distribute verbatim copies of the Source form of the
+% Standard Version of this Package in any medium without restriction,
+% either gratis or for a Distributor Fee, provided that you duplicate
+% all of the original copyright notices and associated disclaimers. At
+% your discretion, such verbatim copies may or may not include a
+% Compiled form of the Package.
+%
+% (3) You may apply any bug fixes, portability changes, and other
+% modifications made available from the Copyright Holder. The resulting
+% Package will still be considered the Standard Version, and as such
+% will be subject to the Original License.
+%
+% Distribution of Modified Versions of the Package as Source
+%
+% (4) You may Distribute your Modified Version as Source (either gratis
+% or for a Distributor Fee, and with or without a Compiled form of the
+% Modified Version) provided that you clearly document how it differs
+% from the Standard Version, including, but not limited to, documenting
+% any non-standard features, executables, or modules, and provided that
+% you do at least ONE of the following:
+%
+% (a) make the Modified Version available to the Copyright Holder of the
+% Standard Version, under the Original License, so that the Copyright
+% Holder may include your modifications in the Standard Version.  (b)
+% ensure that installation of your Modified Version does not prevent the
+% user installing or running the Standard Version. In addition, the
+% modified Version must bear a name that is different from the name of
+% the Standard Version.  (c) allow anyone who receives a copy of the
+% Modified Version to make the Source form of the Modified Version
+% available to others under (i) the Original License or (ii) a license
+% that permits the licensee to freely copy, modify and redistribute the
+% Modified Version using the same licensing terms that apply to the copy
+% that the licensee received, and requires that the Source form of the
+% Modified Version, and of any works derived from it, be made freely
+% available in that license fees are prohibited but Distributor Fees are
+% allowed.
+%
+% Distribution of Compiled Forms of the Standard Version or
+% Modified Versions without the Source
+%
+% (5) You may Distribute Compiled forms of the Standard Version without
+% the Source, provided that you include complete instructions on how to
+% get the Source of the Standard Version. Such instructions must be
+% valid at the time of your distribution. If these instructions, at any
+% time while you are carrying out such distribution, become invalid, you
+% must provide new instructions on demand or cease further
+% distribution. If you provide valid instructions or cease distribution
+% within thirty days after you become aware that the instructions are
+% invalid, then you do not forfeit any of your rights under this
+% license.
+%
+% (6) You may Distribute a Modified Version in Compiled form without the
+% Source, provided that you comply with Section 4 with respect to the
+% Source of the Modified Version.
+%
+% Aggregating or Linking the Package
+%
+% (7) You may aggregate the Package (either the Standard Version or
+% Modified Version) with other packages and Distribute the resulting
+% aggregation provided that you do not charge a licensing fee for the
+% Package. Distributor Fees are permitted, and licensing fees for other
+% components in the aggregation are permitted. The terms of this license
+% apply to the use and Distribution of the Standard or Modified Versions
+% as included in the aggregation.
+%
+% (8) You are permitted to link Modified and Standard Versions with
+% other works, to embed the Package in a larger work of your own, or to
+% build stand-alone binary or bytecode versions of applications that
+% include the Package, and Distribute the result without restriction,
+% provided the result does not expose a direct interface to the Package.
+%
+% Items That are Not Considered Part of a Modified Version
+%
+% (9) Works (including, but not limited to, modules and scripts) that
+% merely extend or make use of the Package, do not, by themselves, cause
+% the Package to be a Modified Version. In addition, such works are not
+% considered parts of the Package itself, and are not subject to the
+% terms of this license.
+%
+% General Provisions
+%
+% (10) Any use, modification, and distribution of the Standard or
+% Modified Versions is governed by this Artistic License. By using,
+% modifying or distributing the Package, you accept this license. Do not
+% use, modify, or distribute the Package, if you do not accept this
+% license.
+%
+% (11) If your Modified Version has been derived from a Modified Version
+% made by someone other than you, you are nevertheless required to
+% ensure that your Modified Version complies with the requirements of
+% this license.
+%
+% (12) This license does not grant you the right to use any trademark,
+% service mark, tradename, or logo of the Copyright Holder.
+%
+% (13) This license includes the non-exclusive, worldwide,
+% free-of-charge patent license to make, have made, use, offer to sell,
+% sell, import and otherwise transfer the Package with respect to any
+% patent claims licensable by the Copyright Holder that are necessarily
+% infringed by the Package. If you institute patent litigation
+% (including a cross-claim or counterclaim) against any party alleging
+% that the Package constitutes direct or contributory patent
+% infringement, then this Artistic License to you shall terminate on the
+% date that such litigation is filed.
+%
+% (14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT
+% HOLDER AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED
+% WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+% PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT
+% PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT
+% HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT,
+% INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE
+% OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Figuring out the version of a problog file in a nasty way :-D
+% This way SVN does the work of keeping the file date
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+:- module(version_control, [get_version/3]).
+
+:- use_module(library(lists), [append/3, reverse/2]).
+
+get_version(FilePath, Version, Revision):-
+  open(FilePath, read, SI),
+  repeat,
+  get_line(SI, Line),
+  (append(_, ['D','a','t','e',':'|Date], Line) ; at_end_of_stream(SI)),
+  !,
+  repeat,
+  get_line(SI, NLine),
+  (append(_, ['R','e','v','i','s','i','o','n',':'|Revision1], NLine) ; at_end_of_stream(SI)),
+  !,
+  close(SI),
+  append(ReadDate,['$'|_],Date),
+  append(Revision2,['$'|_],Revision1),
+  atomic_concat(ReadDate, Version),
+  atomic_concat(Revision2, Revision).
+
+get_line(Stream, Line):-
+  get_line(Stream, LineR, []),
+  reverse(LineR, Line).
+get_line(Stream, Line, Acc):-
+  get_char(Stream, Char),
+  ((Char = '\n' ; at_end_of_stream(Stream)) ->
+    Line = Acc
+  ;
+    get_line(Stream, Line, [Char|Acc])
+  ).

packages/ProbLog/problog_examples/graph.pl

@@ -3,6 +3,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % ProbLog program describing a probabilistic graph
 % (running example from ProbLog presentations)
+% $Id: graph.pl 4875 2010-10-05 15:28:35Z theo $
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 :- use_module('../problog').

packages/ProbLog/problog_examples/graph_tabled.pl

@@ -3,6 +3,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % ProbLog program describing a probabilistic graph using tabling
 % (running example from ProbLog presentations)
+% $Id: graph_tabled.pl 4875 2010-10-05 15:28:35Z theo $
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 :- use_module('../problog').

packages/ProbLog/problog_examples/learn_graph.pl

@@ -3,11 +3,13 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % ProbLog program describing a probabilistic graph
 % (running example from ProbLog presentations)
-% 
+% $Id: learn_graph.pl 4875 2010-10-05 15:28:35Z theo $
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % example for parameter learning with LeProbLog
 %
 % training and test examples are included at the end of the file
-% 
 % query ?- do_learning(20).
 % will run 20 iterations of learning with default settings
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

packages/ProbLog/problog_examples/office.pl

@@ -2,12 +2,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % ProbLog program describing an office window
-% 
 % example for using hybrid ProbLog
-%
+% $Id: office.pl 4876 2010-10-05 16:15:57Z theo $
-% query ?- problog_exact(room_has_window, Prob, Status).
-% Prob = 0.008527075,
-% Status = ok ?
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 :- use_module('../problog').
@@ -25,3 +21,8 @@ room_has_window:-
 room_has_window:-
 	in_corridor,corridor_has_window.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% query ?- problog_exact(room_has_window, Prob, Status).
+% Prob = 0.01517076,
+% Status = ok ?
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

packages/ProbLog/problog_examples/viralmarketing.pl

@@ -1,5 +1,11 @@
 %%% -*- Mode: Prolog; -*-
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ProbLog program describing a viral marketing problem
+% example for using decision theory ProbLog
+% $Id: viralmarketing.pl 4875 2010-10-05 15:28:35Z theo $
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 % The viral marketing example consists of a social network of friend relations. You have to decide which persons to market. Sending marketing has a cost of 2, but might cause people to buy your product, giving you a profit of 5. When someone buys the product, it becomes more likely that his friends also buy the product.
 
 :- use_module('../dtproblog').

packages/ProbLog/problog_examples/viralmarketing_tabled.pl

@@ -1,5 +1,11 @@
 %%% -*- Mode: Prolog; -*-
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ProbLog program describing a viral marketing problem
+% example for using tabled decision theory ProbLog
+% $Id: viralmarketing_tabled.pl 4875 2010-10-05 15:28:35Z theo $
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 % The viral marketing example consists of a social network of friend relations. You have to decido which persons to market. Sending marketing has a cost of 2, but might cause people to buy your product, giving you a profit of 5. When someone buys the product, it becomes more likely that his friends also buy the product.
 
 :- use_module('../dtproblog').

packages/ProbLog/problog_learning.yap

@@ -2,8 +2,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  $Date: 2010-09-30 16:15:04 +0200 (Thu, 30 Sep 2010) $
+%  $Date: 2010-10-05 16:52:13 +0200 (Tue, 05 Oct 2010) $
-%  $Revision: 4864 $
+%  $Revision: 4869 $
 %
 %  This file is part of ProbLog
 %  http://dtai.cs.kuleuven.be/problog
@@ -364,7 +364,7 @@ check_examples :-
 	 (current_predicate(user:example/4),user:example(ID,_,P,_), (\+ number(P); P>1 ; P<0))
 	->
 	 (
-	  format(user_error,'The training example ~q does not have a valid probaility value (~q).~n',[ID,P]),
+	  format(user_error,'The training example ~q does not have a valid probability value (~q).~n',[ID,P]),
 	  throw(error(examples))
 	 ); true
 	),
@@ -373,7 +373,7 @@ check_examples :-
 	 (current_predicate(user:test_example/4),user:test_example(ID,_,P,_), (\+ number(P); P>1 ; P<0))
 	->
 	 (
-	  format(user_error,'The test example ~q does not have a valid probaility value (~q).~n',[ID,P]),
+	  format(user_error,'The test example ~q does not have a valid probability value (~q).~n',[ID,P]),
 	  throw(error(examples))
 	 ); true
 	),