init better; problog_low accepts conditional probabilities (untested); accept (p0::a;p1::b).

packages/ProbLog/problog/ad_converter.yap

@@ -9,71 +9,71 @@
 %  http://dtai.cs.kuleuven.be/problog
 %
 %  ProbLog was developed at Katholieke Universiteit Leuven
-%                                                            
+%
 %  Copyright 2009
 %  Angelika Kimmig, Vitor Santos Costa, Bernd Gutmann
-%                                                              
+%
 %  Main authors of this file:
 %  Bernd Gutmann
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % 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.
@@ -81,34 +81,34 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % 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)
@@ -127,7 +127,7 @@
 %
 % 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
@@ -138,13 +138,13 @@
 % 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
@@ -152,7 +152,7 @@
 % 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
@@ -160,7 +160,7 @@
 % 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
@@ -168,21 +168,21 @@
 % 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
@@ -192,7 +192,7 @@
 % 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
@@ -207,7 +207,7 @@
 :- module(ad_converter,[term_expansion_intern_ad/4,
 			op(1149, yfx, <-- ),
 			op( 550, yfx, :: )
-		       ]).	ƒcrete
+		       ]).
 
 % general yap modules
 :- use_module(library(lists),[member/2,append/3]).
@@ -218,7 +218,7 @@
 
 :- discontiguous user:(<--)/2, problog:(<--)/2.
 :- discontiguous user:myclause/1, problog:myclause/1. % notation of ADs in LFI-ProbLog
-	
+
 :- op( 550, yfx, :: ).
 
 % for annotated disjunctions
@@ -284,8 +284,6 @@ term_expansion_intern_ad((Head<--Body), Module, Mode, [user:ad_intern((Head<--Bo
 	;
 	 findall(Module:B,member(B,Aux_Clauses),Result,Result_Atoms)
 	),
-
-	
 	(
 	 problog_flag(show_ad_compilation,true)
 	->
@@ -300,16 +298,11 @@ term_expansion_intern_ad((Head<--Body), Module, Mode, [user:ad_intern((Head<--Bo
         ;
 	 true
 	).
-
 term_expansion_intern_ad( (Head<--Body),_,_) :-
 	format(chars(Error), 'Error at compiling the annotated disjunction ~q<--~m.',[Head,Body]),
 	print_message(error,Error),
 	fail.
 
-
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % proper_ad_head(+Head, +Acc)
 %
@@ -391,7 +384,7 @@ create_mws_atom(A,Body_Vars,ID,Pos,A2) :-
 
 create_ad_aux_facts(P::_, _, _, _, Acc, []) :-
 	% if the probabilities in the head of the AD
-	% sum up to 1.0 drop the last aux fact 
+	% sum up to 1.0 drop the last aux fact
 	abs(Acc+P-1.0) < 0.0000001,
 	!.
 create_ad_aux_facts(P::Atom, Body_Vars, ID, Pos, Acc, [P1::ProbFact]) :-
@@ -416,7 +409,7 @@ create_ad_aux_facts((P::Atom;T), Body_Vars, ID, Pos, Acc, [P1::ProbFact|T2]) :-
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 create_tunable_ad_aux_facts(t(_)::_,_,_,Pos,[]) :-
@@ -431,7 +424,7 @@ create_tunable_ad_aux_facts((t(_)::Atom;T),Body_Vars,ID,Pos,[t(_)::ProbFact|T2])
 	create_tunable_ad_aux_facts(T,Body_Vars,ID,Pos2,T2).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 create_aux_bodies(_::Atom, Body_Vars, Body, ID, Pos, Aux_Facts , _, [(Atom:-Body2)]) :-
@@ -458,7 +451,7 @@ create_aux_bodies((_::Atom; T), Body_Vars, Body, ID, Pos, Aux_Facts , Mode, [(At
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% 
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 tuple_append(true,X,X) :-
 	!.