Some ProbLog improvements related with tabling efficiency, more to come soon
This commit is contained in:
Theofrastos Mantadelis
parent
362ecc2f16
commit
c804d105b6
File diff suppressed because it is too large
Load Diff
@ -2,8 +2,8 @@
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%
|
||||
% $Date: 2010-09-30 13:50:45 +0200 (Thu, 30 Sep 2010) $
|
||||
% $Revision: 4857 $
|
||||
% $Date: 2010-10-11 14:14:11 +0200 (Mon, 11 Oct 2010) $
|
||||
% $Revision: 4892 $
|
||||
%
|
||||
% This file is part of ProbLog
|
||||
% http://dtai.cs.kuleuven.be/problog
|
||||
@ -206,7 +206,6 @@
|
||||
|
||||
|
||||
:- module(logger,[logger_define_variable/2,
|
||||
logger_define_variables/2,
|
||||
logger_set_filename/1,
|
||||
logger_set_delimiter/1,
|
||||
logger_set_variable/2,
|
||||
@ -238,25 +237,35 @@
|
||||
%= +Name, +Type
|
||||
%========================================================================
|
||||
|
||||
logger_define_variable(Name,int) :-
|
||||
logger_define_variable(Name,Type) :-
|
||||
bb_get(logger_variables,Variables),
|
||||
member((Name,_),Variables),
|
||||
!,
|
||||
throw(error(variable_redefined(logger_define_variable(Name,Type)))).
|
||||
logger_define_variable(Name,Type) :-
|
||||
ground(Name),
|
||||
atomic(Name),
|
||||
!,
|
||||
logger_define_variable_intern(Type,Name).
|
||||
logger_define_variable(Name,Type) :-
|
||||
throw(error(illegal_variable_name(logger_define_variable(Name,Type)))).
|
||||
|
||||
logger_define_variable_intern(int,Name) :-
|
||||
!,
|
||||
is_variable_already_defined(Name),
|
||||
bb_delete(logger_variables,OldVariables),
|
||||
append(OldVariables,[(Name,int)],NewVariables),
|
||||
bb_put(logger_variables,NewVariables),
|
||||
atom_concat(logger_data_,Name,Key),
|
||||
bb_put(Key,null).
|
||||
logger_define_variable(Name,float) :-
|
||||
logger_define_variable_intern(float,Name) :-
|
||||
!,
|
||||
is_variable_already_defined(Name),
|
||||
bb_delete(logger_variables,OldVariables),
|
||||
append(OldVariables,[(Name,float)],NewVariables),
|
||||
bb_put(logger_variables,NewVariables),
|
||||
atom_concat(logger_data_,Name,Key),
|
||||
bb_put(Key,null).
|
||||
logger_define_variable(Name,time) :-
|
||||
logger_define_variable_intern(time,Name) :-
|
||||
!,
|
||||
is_variable_already_defined(Name),
|
||||
bb_delete(logger_variables,OldVariables),
|
||||
append(OldVariables,[(Name,time)],NewVariables),
|
||||
bb_put(logger_variables,NewVariables),
|
||||
@ -264,34 +273,9 @@ logger_define_variable(Name,time) :-
|
||||
atom_concat(logger_start_time_,Name,Key2),
|
||||
bb_put(Key,null),
|
||||
bb_put(Key2,null).
|
||||
logger_define_variable(Name,Unknown) :-
|
||||
is_variable_already_defined(Name),
|
||||
write('logger_define_variable, unknown type '),
|
||||
write(Unknown),
|
||||
write(' for variable '),
|
||||
write(Name),
|
||||
nl,
|
||||
fail.
|
||||
logger_define_variable_intern(Type,Name) :-
|
||||
throw(error(unknown_variable_type(logger_define_variable(Name,Type)))).
|
||||
|
||||
is_variable_already_defined(Name) :-
|
||||
bb_get(logger_variables,Variables),
|
||||
member((Name,_),Variables),!,
|
||||
write('logger_define_variable, Variable '),
|
||||
write(Name),
|
||||
write(' is already defined!\n'),
|
||||
fail;
|
||||
true.
|
||||
|
||||
%========================================================================
|
||||
%=
|
||||
%=
|
||||
%= +ListOfNames, +Type
|
||||
%========================================================================
|
||||
|
||||
logger_define_variables([],_).
|
||||
logger_define_variables([H|T],Type) :-
|
||||
logger_define_variable(H,Type),
|
||||
logger_define_variables(T,Type).
|
||||
|
||||
%========================================================================
|
||||
%= Set the filename, to which the output should be appended
|
||||
|
||||
423
packages/ProbLog/problog/nestedtries.yap
Normal file
423
packages/ProbLog/problog/nestedtries.yap
Normal file
@ -0,0 +1,423 @@
|
||||
%%% -*- Mode: Prolog; -*-
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%
|
||||
% $Date: 2010-11-03 19:13:53 +0100 (Wed, 03 Nov 2010) $
|
||||
% $Revision: 4986 $
|
||||
%
|
||||
% 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.
|
||||
%
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
% nested tries handling
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
:- module(nestedtries, [nested_trie_to_depth_breadth_trie/4]).
|
||||
|
||||
:- use_module(library(ordsets), [list_to_ord_set/2, ord_subset/2]). % this two might be better to do a custom fast implementation
|
||||
:- use_module(library(lists), [memberchk/2, delete/3]).
|
||||
:- use_module(library(tries), [trie_to_depth_breadth_trie/6, trie_get_depth_breadth_reduction_entry/1, trie_dup/2, trie_close/1, trie_open/1, trie_replace_nested_trie/3, trie_remove_entry/1, trie_get_entry/2, trie_put_entry/3, trie_traverse/2]).
|
||||
|
||||
:- use_module(flags, [problog_define_flag/5, problog_flag/2]).
|
||||
|
||||
:- style_check(all).
|
||||
:- yap_flag(unknown,error).
|
||||
|
||||
:- initialization((
|
||||
% problog_define_flag(subset_check, problog_flag_validate_boolean, 'perform subset check in nested tries', true, nested_tries),
|
||||
problog_define_flag(loop_refine_ancs, problog_flag_validate_boolean, 'refine ancestors if no loop exists', true, nested_tries)
|
||||
% problog_define_flag(trie_preprocess, problog_flag_validate_boolean, 'perform a preprocess step to nested tries', false, nested_tries),
|
||||
% problog_define_flag(refine_anclst, problog_flag_validate_boolean, 'refine the ancestor list with their childs', false, nested_tries),
|
||||
% problog_define_flag(anclst_represent,problog_flag_validate_in_list([list, integer]), 'represent the ancestor list', list, nested_tries)
|
||||
)).
|
||||
|
||||
|
||||
trie_replace_entry(_Trie, Entry, _E, false):-
|
||||
!, trie_remove_entry(Entry).
|
||||
trie_replace_entry(Trie, Entry, E, true):-
|
||||
!, trie_get_entry(Entry, Proof),
|
||||
delete(Proof, E, NewProof),
|
||||
(NewProof == [] ->
|
||||
trie_delete(Trie),
|
||||
trie_put_entry(Trie, [true], _)
|
||||
;
|
||||
trie_remove_entry(Entry),
|
||||
trie_put_entry(Trie, NewProof, _)
|
||||
).
|
||||
trie_replace_entry(Trie, _Entry, t(ID), R):-
|
||||
trie_replace_nested_trie(Trie, ID, R).
|
||||
|
||||
trie_delete(Trie):-
|
||||
trie_traverse(Trie, R),
|
||||
trie_remove_entry(R),
|
||||
fail.
|
||||
trie_delete(_Trie).
|
||||
|
||||
is_state(Variable):-
|
||||
Variable == true, !.
|
||||
is_state(Variable):-
|
||||
Variable == false.
|
||||
is_state(Variable):-
|
||||
nonvar(Variable),
|
||||
Variable = not(NestedVariable),
|
||||
is_state(NestedVariable).
|
||||
|
||||
is_trie(Trie, ID):-
|
||||
nonvar(Trie),
|
||||
Trie = t(ID), !.
|
||||
is_trie(Trie, ID):-
|
||||
nonvar(Trie),
|
||||
Trie = not(NestedTrie),
|
||||
is_trie(NestedTrie, ID).
|
||||
|
||||
is_label(Label, ID):-
|
||||
atom(Label), !,
|
||||
atomic_concat('L', ID, Label).
|
||||
is_label(Label, ID):-
|
||||
nonvar(Label),
|
||||
Label = not(NestedLabel),
|
||||
is_label(NestedLabel, ID).
|
||||
|
||||
% Ancestor related stuff
|
||||
|
||||
initialise_ancestors(0):-
|
||||
problog_flag(anclst_represent, integer).
|
||||
initialise_ancestors([]):-
|
||||
problog_flag(anclst_represent, list).
|
||||
|
||||
add_to_ancestors(ID, Ancestors, NewAncestors):-
|
||||
integer(Ancestors), !,
|
||||
NewAncestors is (1 << (ID - 1)) \/ Ancestors.
|
||||
add_to_ancestors(ID, Ancestors, NewAncestors):-
|
||||
is_list(Ancestors),
|
||||
list_to_ord_set([ID|Ancestors], NewAncestors).
|
||||
|
||||
ancestor_subset_check(SubAncestors, Ancestors):-
|
||||
integer(SubAncestors), !,
|
||||
SubAncestors is Ancestors /\ SubAncestors.
|
||||
ancestor_subset_check(SubAncestors, Ancestors):-
|
||||
is_list(SubAncestors),
|
||||
ord_subset(SubAncestors, Ancestors).
|
||||
|
||||
ancestor_loop_refine(Loop, Ancestors, 0):-
|
||||
var(Loop), integer(Ancestors), !.
|
||||
ancestor_loop_refine(Loop, Ancestors, []):-
|
||||
var(Loop), is_list(Ancestors), !.
|
||||
ancestor_loop_refine(true, Ancestors, Ancestors).
|
||||
|
||||
% Cycle check related stuff
|
||||
% missing synonym check
|
||||
|
||||
cycle_check(ID, Ancestors):-
|
||||
integer(Ancestors), !,
|
||||
Bit is 1 << (ID - 1),
|
||||
Bit is Bit /\ Ancestors.
|
||||
cycle_check(ID, Ancestors):-
|
||||
is_list(Ancestors),
|
||||
memberchk(ID, Ancestors).
|
||||
|
||||
preprocess(Index, DepthBreadthTrie, OptimizationLevel, StartCount, FinalEndCount):-
|
||||
problog:problog_chktabled(Index, Trie), !,
|
||||
trie_dup(Trie, CopyTrie),
|
||||
initialise_ancestors(Ancestors),
|
||||
make_nested_trie_base_cases(CopyTrie, t(Index), DepthBreadthTrie, OptimizationLevel, StartCount, EndCount, Ancestors),
|
||||
trie_close(CopyTrie),
|
||||
Next is Index + 1,
|
||||
preprocess(Next, DepthBreadthTrie, OptimizationLevel, EndCount, FinalEndCount).
|
||||
preprocess(_, _, _, FinalEndCount, FinalEndCount).
|
||||
|
||||
make_nested_trie_base_cases(Trie, t(ID), DepthBreadthTrie, OptimizationLevel, StartCount, FinalEndCount, Ancestors):-
|
||||
trie_to_depth_breadth_trie(Trie, DepthBreadthTrie, Label, OptimizationLevel, StartCount, EndCount),
|
||||
(is_trie(Label, SID) ->
|
||||
trie_get_depth_breadth_reduction_entry(NestedEntry),
|
||||
trie_replace_entry(Trie, NestedEntry, Label, false),
|
||||
add_to_ancestors(SID, Ancestors, NewAncestors),
|
||||
make_nested_trie_base_cases(Trie, t(ID), DepthBreadthTrie, OptimizationLevel, EndCount, FinalEndCount, NewAncestors)
|
||||
;
|
||||
FinalEndCount = EndCount,
|
||||
get_set_trie(ID, Label, Ancestors)
|
||||
).
|
||||
|
||||
nested_trie_to_depth_breadth_trie(Trie, DepthBreadthTrie, FinalLabel, OptimizationLevel):-
|
||||
integer(OptimizationLevel),
|
||||
trie_open(DepthBreadthTrie),
|
||||
(problog_flag(trie_preprocess, true) ->
|
||||
preprocess(1, DepthBreadthTrie, OptimizationLevel, 0, StartCount)
|
||||
;
|
||||
StartCount = 0
|
||||
),
|
||||
initialise_ancestors(Ancestors),
|
||||
% initialise_ancestors(Childs),
|
||||
(problog_flag(loop_refine_ancs, true) ->
|
||||
trie_2_dbtrie_init(Trie, DepthBreadthTrie, OptimizationLevel, StartCount, _, Ancestors, FinalLabel, _)
|
||||
;
|
||||
trie_2_dbtrie_init(Trie, DepthBreadthTrie, OptimizationLevel, StartCount, _, Ancestors, FinalLabel, true)
|
||||
),
|
||||
eraseall(problog_trie_table).
|
||||
|
||||
trie_2_dbtrie_init(ID, DepthBreadthTrie, OptimizationLevel, StartCount, EndCount, Ancestors, Label, ContainLoop):-
|
||||
get_trie_pointer(ID, Trie),
|
||||
trie_dup(Trie, CopyTrie),
|
||||
trie_2_dbtrie_intern(CopyTrie, DepthBreadthTrie, OptimizationLevel, StartCount, EndCount, Ancestors, Label, ContainLoop),
|
||||
trie_close(CopyTrie).
|
||||
|
||||
trie_2_dbtrie_intern(Trie, DepthBreadthTrie, OptimizationLevel, StartCount, FinalEndCount, Ancestors, TrieLabel, ContainLoop):-
|
||||
trie_to_depth_breadth_trie(Trie, DepthBreadthTrie, Label, OptimizationLevel, StartCount, EndCount),
|
||||
(is_trie(Label, ID) -> % Label might have issues with negation
|
||||
trie_get_depth_breadth_reduction_entry(NestedEntry),
|
||||
% check if Trie introduces a loop
|
||||
(cycle_check(ID, Ancestors) ->
|
||||
ContainLoop = true,
|
||||
NewLabel = false,
|
||||
NewEndCount = EndCount
|
||||
;
|
||||
% check if Trie is resolved and extract it
|
||||
(get_set_trie(ID, NewLabel, Ancestors) ->
|
||||
NewEndCount = EndCount
|
||||
;
|
||||
% calculate the nested trie
|
||||
add_to_ancestors(ID, Ancestors, NewAncestors), % to be able to support 2 representations
|
||||
trie_2_dbtrie_init(ID, DepthBreadthTrie, OptimizationLevel, EndCount, NewEndCount, NewAncestors, NewLabel, NewContainLoop),
|
||||
ancestor_loop_refine(NewContainLoop, Ancestors, RefinedAncestors),
|
||||
get_set_trie(ID, NewLabel, RefinedAncestors),
|
||||
ContainLoop = NewContainLoop
|
||||
)
|
||||
),
|
||||
trie_replace_entry(Trie, NestedEntry, t(ID), NewLabel), % should be careful to verify that it works also with not(t(ID))
|
||||
trie_2_dbtrie_intern(Trie, DepthBreadthTrie, OptimizationLevel, NewEndCount, FinalEndCount, Ancestors, TrieLabel, ContainLoop)
|
||||
;
|
||||
% else we can terminate and return
|
||||
FinalEndCount = EndCount,
|
||||
TrieLabel = Label
|
||||
).
|
||||
|
||||
% predicate to check/remember resolved tries
|
||||
% no refiment of ancestor list included
|
||||
|
||||
get_trie_pointer(ID, Trie):-
|
||||
problog:problog_chktabled(ID, Trie), !.
|
||||
get_trie_pointer(Trie, Trie).
|
||||
|
||||
get_set_trie(Trie, Label, Ancestors):-
|
||||
recorded(problog_trie_table, store(Trie, StoredAncestors, Label), _),
|
||||
(problog_flag(subset_check, true) ->
|
||||
ancestor_subset_check(StoredAncestors, Ancestors)
|
||||
;
|
||||
StoredAncestors == Ancestors
|
||||
), !.
|
||||
get_set_trie(Trie, Label, Ancestors):-
|
||||
ground(Label),
|
||||
recordz(problog_trie_table, store(Trie, Ancestors, Label), _).
|
||||
|
||||
|
||||
% chk_negated([H|T], ID):-
|
||||
% simplify(H, not(t(ID))), !.
|
||||
% chk_negated([_|T], ID):-
|
||||
% chk_negated(T, ID).
|
||||
|
||||
|
||||
/*
|
||||
chk_negated([], ID, ID).
|
||||
chk_negated([H|T], ID, not(ID)):-
|
||||
simplify(H, not(t(ID))), !.
|
||||
chk_negated([H|T], ID, ID):-
|
||||
simplify(H, t(ID)), !.
|
||||
chk_negated([_|T], ID, FID):-
|
||||
chk_negated(T, ID, FID).*/
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%
|
||||
% $Date: 2010-10-06 12:56:13 +0200 (Wed, 06 Oct 2010) $
|
||||
% $Revision: 4877 $
|
||||
% $Date: 2010-11-03 19:08:13 +0100 (Wed, 03 Nov 2010) $
|
||||
% $Revision: 4984 $
|
||||
%
|
||||
% This file is part of ProbLog
|
||||
% http://dtai.cs.kuleuven.be/problog
|
||||
@ -445,6 +445,7 @@ problog_neg(M:G):-
|
||||
functor(G, Name, Arity),
|
||||
\+ problog_tabled(M:Name/Arity),
|
||||
\+ problog:problog_predicate(Name, Arity),
|
||||
\+ (Name == problog_neg, Arity == 1),
|
||||
throw(problog_neg_error('Error: goal must be dynamic and tabled', M:G)).
|
||||
problog_neg(M:G):-
|
||||
% exact inference
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%
|
||||
% $Date: 2010-09-28 21:04:43 +0200 (Tue, 28 Sep 2010) $
|
||||
% $Revision: 4838 $
|
||||
% $Date: 2010-10-15 17:09:55 +0200 (Fri, 15 Oct 2010) $
|
||||
% $Revision: 4939 $
|
||||
%
|
||||
% This file is part of ProbLog
|
||||
% http://dtai.cs.kuleuven.be/problog
|
||||
@ -208,9 +208,10 @@
|
||||
:- module(timer,[timer_start/1, % +ID
|
||||
timer_stop/2, % +ID,-Duration
|
||||
timer_pause/1, % +ID
|
||||
timer_pause/2, % +ID
|
||||
timer_resume/1]). % +ID
|
||||
|
||||
timer_pause/2, % +ID,-Duration
|
||||
timer_resume/1, % +ID
|
||||
timer_elapsed/2, % +ID, -Duration
|
||||
timer_reset/1]). % +ID
|
||||
:- yap_flag(unknown,error).
|
||||
:- style_check(single_var).
|
||||
|
||||
@ -228,6 +229,11 @@ timer_start(Name) :-
|
||||
assertz(timer(Name,StartTime))
|
||||
).
|
||||
|
||||
timer_start_forced(Name) :-
|
||||
retractall(timer(Name,_)),
|
||||
statistics(walltime,[StartTime,_]),
|
||||
assertz(timer(Name,StartTime)).
|
||||
|
||||
timer_stop(Name,Duration) :-
|
||||
(
|
||||
retract(timer(Name,StartTime))
|
||||
@ -270,3 +276,17 @@ timer_resume(Name):-
|
||||
|
||||
throw(timer_not_paused(timer_resume(Name)))
|
||||
).
|
||||
|
||||
timer_elapsed(Name,Duration) :-
|
||||
(
|
||||
timer(Name,StartTime)
|
||||
->
|
||||
statistics(walltime,[StopTime,_]),
|
||||
Duration is StopTime-StartTime;
|
||||
|
||||
throw(timer_not_started(timer_elapsed(Name,Duration)))
|
||||
).
|
||||
|
||||
timer_reset(Name) :-
|
||||
retractall(timer(Name,_)),
|
||||
retractall(timer_paused(Name,_)).
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%
|
||||
% $Date: 2010-09-28 21:04:43 +0200 (Tue, 28 Sep 2010) $
|
||||
% $Revision: 4838 $
|
||||
% $Date: 2010-11-03 19:08:13 +0100 (Wed, 03 Nov 2010) $
|
||||
% $Revision: 4984 $
|
||||
%
|
||||
% This file is part of ProbLog
|
||||
% http://dtai.cs.kuleuven.be/problog
|
||||
@ -247,11 +247,15 @@
|
||||
% load library modules
|
||||
:- use_module(library(tries)).
|
||||
:- use_module(library(lists), [append/3, member/2, memberchk/2, delete/3]).
|
||||
:- use_module(library(system), [delete_file/1, shell/1, tmpnam/1]).
|
||||
:- use_module(library(system), [tmpnam/1]).
|
||||
:- use_module(library(ordsets), [ord_intersection/3, ord_union/3]).
|
||||
|
||||
|
||||
|
||||
% load our own modules
|
||||
:- use_module(flags).
|
||||
:- use_module(utils).
|
||||
:- use_module(nestedtries, [nested_trie_to_depth_breadth_trie/4]).
|
||||
|
||||
% switch on all tests to reduce bug searching time
|
||||
:- style_check(all).
|
||||
@ -463,30 +467,31 @@ name_vars([A|B]) :-
|
||||
|
||||
nested_ptree_to_BDD_struct_script(Trie, BDDFileName, Variables):-
|
||||
tmpnam(TmpFile1),
|
||||
tmpnam(TmpFile2),
|
||||
open(TmpFile1, 'write', BDDS),
|
||||
(generate_BDD_from_trie(Trie, Inter, BDDS) ->
|
||||
next_intermediate_step(TMP), InterCNT is TMP - 1,
|
||||
write(BDDS, Inter), nl(BDDS),
|
||||
|
||||
(
|
||||
generate_BDD_from_trie(Trie, Inter, BDDS)
|
||||
->
|
||||
(
|
||||
next_intermediate_step(TMP),
|
||||
InterCNT is TMP - 1,
|
||||
format(BDDS,'~q~n',[Inter]),
|
||||
close(BDDS),
|
||||
(get_used_vars(Variables, VarCNT);VarCNT = 0),
|
||||
open(TmpFile2, 'write', HEADERS),
|
||||
write(HEADERS, '@BDD1'), nl(HEADERS),
|
||||
write(HEADERS, VarCNT), nl(HEADERS),
|
||||
write(HEADERS, 0), nl(HEADERS),
|
||||
write(HEADERS, InterCNT), nl(HEADERS),
|
||||
close(HEADERS),
|
||||
atomic_concat(['cat ', TmpFile2, ' ', TmpFile1, ' > ', BDDFileName], CMD),
|
||||
shell(CMD),
|
||||
delete_file(TmpFile1),
|
||||
delete_file(TmpFile2),
|
||||
(
|
||||
get_used_vars(Variables, VarCNT)
|
||||
->
|
||||
true;
|
||||
VarCNT = 0
|
||||
),
|
||||
create_bdd_file_with_header(BDDFileName,VarCNT,InterCNT,TmpFile1),
|
||||
delete_file_silent(TmpFile1),
|
||||
cleanup_BDD_generation
|
||||
;
|
||||
);(
|
||||
close(BDDS),
|
||||
(delete_file(TmpFile1);true),
|
||||
(delete_file(TmpFile2);true),
|
||||
delete_file_silent(TmpFile1),
|
||||
cleanup_BDD_generation,
|
||||
fail
|
||||
)
|
||||
).
|
||||
|
||||
trie_to_bdd_struct_trie(A, B, OutputFile, OptimizationLevel, Variables) :-
|
||||
@ -528,7 +533,8 @@ trie_to_bdd_struct_trie(A, B, OutputFile, OptimizationLevel, Variables) :-
|
||||
).
|
||||
|
||||
nested_trie_to_bdd_struct_trie(A, B, OutputFile, OptimizationLevel, Variables):-
|
||||
trie_nested_to_depth_breadth_trie(A, B, LL, OptimizationLevel, problog:problog_chktabled),
|
||||
%trie_nested_to_depth_breadth_trie(A, B, LL, OptimizationLevel, problog:problog_chktabled),
|
||||
nested_trie_to_depth_breadth_trie(A, B, LL, OptimizationLevel),
|
||||
(is_label(LL) ->
|
||||
retractall(deref(_,_)),
|
||||
(problog_flag(deref_terms, true) ->
|
||||
@ -571,15 +577,20 @@ nested_trie_to_bdd_struct_trie(A, B, OutputFile, OptimizationLevel, Variables):-
|
||||
write(1), nl,
|
||||
write(0), nl,
|
||||
write(1), nl,
|
||||
get_var_name(LL, NLL),
|
||||
write('L1 = '),write(NLL),nl,
|
||||
simplify(LL, FLL),
|
||||
(FLL = not(_) ->
|
||||
write('L1 = ~')
|
||||
;
|
||||
write('L1 = ')
|
||||
),
|
||||
get_var_name(FLL, NLL),
|
||||
write(NLL),nl,
|
||||
write('L1'), nl,
|
||||
told
|
||||
).
|
||||
|
||||
ptree_decomposition_struct(Trie, BDDFileName, Variables) :-
|
||||
tmpnam(TmpFile1),
|
||||
tmpnam(TmpFile2),
|
||||
nb_setval(next_inter_step, 1),
|
||||
variables_in_dbtrie(Trie, Variables),
|
||||
length(Variables, VarCnt),
|
||||
@ -599,16 +610,8 @@ ptree_decomposition_struct(Trie, BDDFileName, Variables) :-
|
||||
write('L1'), nl
|
||||
),
|
||||
told,
|
||||
tell(TmpFile2),
|
||||
write('@BDD1'),nl,
|
||||
write(VarCnt),nl,
|
||||
write('0'),nl,
|
||||
write(LCnt),nl,
|
||||
told,
|
||||
atomic_concat(['cat ', TmpFile2, ' ', TmpFile1, ' > ', BDDFileName], CMD),
|
||||
shell(CMD),
|
||||
delete_file(TmpFile1),
|
||||
delete_file(TmpFile2).
|
||||
create_bdd_file_with_header(BDDFileName,VarCnt,LCnt,TmpFile1),
|
||||
delete_file_silent(TmpFile1).
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
% write BDD info for given ptree to file
|
||||
@ -696,10 +699,10 @@ bdd_vars_script_intern(A) :-
|
||||
).
|
||||
bdd_vars_script_intern2(A) :-
|
||||
get_var_name(A,NameA),
|
||||
atom_chars(A,A_Chars),
|
||||
atom_codes(A,A_Codes),
|
||||
|
||||
once(append(Part1,[95|Part2],A_Chars)), % 95 = '_'
|
||||
number_chars(ID,Part1),
|
||||
once(append(Part1,[95|Part2],A_Codes)), % 95 = '_'
|
||||
number_codes(ID,Part1),
|
||||
|
||||
( % let's check whether Part2 contains an 'l' (l=low)
|
||||
member(108,Part2)
|
||||
@ -709,7 +712,7 @@ bdd_vars_script_intern2(A) :-
|
||||
format('@~w~n0~n0~n~12f;~12f~n',[NameA,Mu,Sigma])
|
||||
);
|
||||
(
|
||||
number_chars(Grounding_ID,Part2),
|
||||
number_codes(Grounding_ID,Part2),
|
||||
(problog:decision_fact(ID,_) ->
|
||||
% it's a non-ground decision
|
||||
(problog:problog_control(check,internal_strategy) ->
|
||||
@ -987,8 +990,44 @@ get_next_name(Name) :-
|
||||
% create BDD-var as fact id prefixed by x
|
||||
% learning.yap relies on this format!
|
||||
% when changing, also adapt test_var_name/1 below
|
||||
|
||||
|
||||
simplify_list(List, SList):-
|
||||
findall(NEL, (member(El, List), simplify(El, NEL)), SList).
|
||||
|
||||
simplify(not(false), true):- !.
|
||||
simplify(not(true), false):- !.
|
||||
simplify(not(not(A)), B):-
|
||||
!, simplify(A, B).
|
||||
simplify(A, A).
|
||||
|
||||
|
||||
|
||||
simplify(not(false), true):- !.
|
||||
simplify(not(true), false):- !.
|
||||
simplify(not(not(A)), B):-
|
||||
!, simplify(A, B).
|
||||
simplify(A, A).
|
||||
|
||||
get_var_name(true, 'TRUE'):- !.
|
||||
get_var_name(false, 'FALSE'):- !.
|
||||
get_var_name(Variable, Name):-
|
||||
atomic(Variable), !,
|
||||
atomic_concat([x, Variable], Name),
|
||||
(recorded(map, m(Variable, Name), _) ->
|
||||
true
|
||||
;
|
||||
recorda(map, m(Variable, Name), _)
|
||||
).
|
||||
get_var_name(not(A), NameA):-
|
||||
get_var_name(A, NameA).
|
||||
|
||||
|
||||
/*
|
||||
get_var_name(true, 'TRUE') :-!.
|
||||
get_var_name(false, 'FALSE') :-!.
|
||||
get_var_name(not(A), NameA):-
|
||||
!, get_var_name(A, NameA).
|
||||
get_var_name(A, NameA) :-
|
||||
atomic_concat([x, A], NameA),
|
||||
(
|
||||
@ -997,7 +1036,7 @@ get_var_name(A, NameA) :-
|
||||
true
|
||||
;
|
||||
recorda(map, m(A, NameA), _)
|
||||
).
|
||||
).*/
|
||||
|
||||
% test used by base case of compression mapping to detect single-variable tree
|
||||
% has to match above naming scheme
|
||||
@ -1060,39 +1099,29 @@ spacy_print(Msg, Level, Space):-
|
||||
:- dynamic(generated_trie/2).
|
||||
:- dynamic(next_intermediate_step/1).
|
||||
|
||||
%
|
||||
% This needs to be modified
|
||||
% Include nasty code of temporary file usage
|
||||
% also it is OS depended (requires the cat utility)
|
||||
%
|
||||
|
||||
nested_ptree_to_BDD_script(Trie, BDDFileName, VarFileName):-
|
||||
tmpnam(TmpFile1),
|
||||
tmpnam(TmpFile2),
|
||||
open(TmpFile1, 'write', BDDS),
|
||||
(generate_BDD_from_trie(Trie, Inter, BDDS) ->
|
||||
next_intermediate_step(TMP), InterCNT is TMP - 1,
|
||||
write(BDDS, Inter), nl(BDDS),
|
||||
close(BDDS),
|
||||
(get_used_vars(Vars, VarCNT);VarCNT = 0),
|
||||
open(TmpFile2, 'write', HEADERS),
|
||||
write(HEADERS, '@BDD1'), nl(HEADERS),
|
||||
write(HEADERS, VarCNT), nl(HEADERS),
|
||||
write(HEADERS, 0), nl(HEADERS),
|
||||
write(HEADERS, InterCNT), nl(HEADERS),
|
||||
close(HEADERS),
|
||||
atomic_concat(['cat ', TmpFile2, ' ', TmpFile1, ' > ', BDDFileName], CMD),
|
||||
shell(CMD),
|
||||
delete_file(TmpFile1),
|
||||
delete_file(TmpFile2),
|
||||
(
|
||||
get_used_vars(Vars, VarCNT)
|
||||
->
|
||||
true;
|
||||
VarCNT = 0
|
||||
),
|
||||
create_bdd_file_with_header(BDDFileName,VarCNT,InterCNT,TmpFile1),
|
||||
delete_file_silent(TmpFile1),
|
||||
open(VarFileName, 'write', VarStream),
|
||||
bddvars_to_script(Vars, VarStream),
|
||||
close(VarStream),
|
||||
cleanup_BDD_generation
|
||||
;
|
||||
close(BDDS),
|
||||
(delete_file(TmpFile1);true),
|
||||
(delete_file(TmpFile2);true),
|
||||
delete_file_silent(TmpFile1),
|
||||
cleanup_BDD_generation,
|
||||
fail
|
||||
).
|
||||
@ -1136,7 +1165,7 @@ write_bdd_lineterm([LineTerm|LineTerms], Operator, Stream):-
|
||||
|
||||
generate_line([], [], Inter, _Stream):-
|
||||
!, get_next_intermediate_step(Inter).
|
||||
generate_line([neg(t(Hash))|L], [TrieInter|T] , Inter, Stream):-
|
||||
generate_line([not(t(Hash))|L], [TrieInter|T] , Inter, Stream):-
|
||||
!, problog:problog_chktabled(Hash, Trie),
|
||||
generate_BDD_from_trie(Trie, TrieInterTmp, Stream),
|
||||
atomic_concat(['~', TrieInterTmp], TrieInter),
|
||||
@ -1159,11 +1188,11 @@ bddvars_to_script([H|T], Stream):-
|
||||
(number(H) ->
|
||||
CurVar = H
|
||||
;
|
||||
atom_chars(H, H_Chars),
|
||||
atom_codes(H, H_Codes),
|
||||
% 95 = '_'
|
||||
append(Part1, [95|Part2], H_Chars),
|
||||
number_chars(CurVar, Part1),
|
||||
number_chars(Grounding_ID, Part2)
|
||||
append(Part1, [95|Part2], H_Codes),
|
||||
number_codes(CurVar, Part1),
|
||||
number_codes(Grounding_ID, Part2)
|
||||
),
|
||||
(problog:dynamic_probability_fact(CurVar) ->
|
||||
problog:grounding_is_known(Goal, Grounding_ID),
|
||||
@ -1198,6 +1227,7 @@ make_bdd_var(V, VName):-
|
||||
get_var_name(V, VName),
|
||||
add_to_vars(V).
|
||||
|
||||
|
||||
add_to_vars(V):-
|
||||
clause(get_used_vars(Vars, _Cnt), true),
|
||||
memberchk(V, Vars),!.
|
||||
@ -1310,7 +1340,8 @@ is_state(true).
|
||||
is_state(false).
|
||||
|
||||
nested_trie_to_bdd_trie(A, B, OutputFile, OptimizationLevel, FileParam):-
|
||||
trie_nested_to_depth_breadth_trie(A, B, LL, OptimizationLevel, problog:problog_chktabled),
|
||||
% trie_nested_to_depth_breadth_trie(A, B, LL, OptimizationLevel, problog:problog_chktabled),
|
||||
nested_trie_to_depth_breadth_trie(A, B, LL, OptimizationLevel),
|
||||
(is_label(LL) ->
|
||||
retractall(deref(_,_)),
|
||||
(problog_flag(deref_terms, true) ->
|
||||
@ -1352,16 +1383,24 @@ nested_trie_to_bdd_trie(A, B, OutputFile, OptimizationLevel, FileParam):-
|
||||
;
|
||||
Edges = [LL]
|
||||
),
|
||||
writeln(Edges),
|
||||
tell(FileParam),
|
||||
bdd_vars_script(Edges),
|
||||
simplify_list(Edges, SEdges),
|
||||
bdd_vars_script(SEdges),
|
||||
told,
|
||||
tell(OutputFile),
|
||||
write('@BDD1'), nl,
|
||||
write(1), nl,
|
||||
write(0), nl,
|
||||
write(1), nl,
|
||||
get_var_name(LL, NLL),
|
||||
write('L1 = '),write(NLL),nl,
|
||||
(LL = not(_) ->
|
||||
write('L1 = ~')
|
||||
;
|
||||
write('L1 = ')
|
||||
),
|
||||
simplify(LL, FLL),
|
||||
get_var_name(FLL, NLL),
|
||||
write(NLL),nl,
|
||||
write('L1'), nl,
|
||||
told
|
||||
).
|
||||
@ -1792,7 +1831,6 @@ seperate([H|T], Labels, [H|Vars]):-
|
||||
|
||||
ptree_decomposition(Trie, BDDFileName, VarFileName) :-
|
||||
tmpnam(TmpFile1),
|
||||
tmpnam(TmpFile2),
|
||||
nb_setval(next_inter_step, 1),
|
||||
variables_in_dbtrie(Trie, T),
|
||||
length(T, VarCnt),
|
||||
@ -1815,16 +1853,8 @@ ptree_decomposition(Trie, BDDFileName, VarFileName) :-
|
||||
write('L1'), nl
|
||||
),
|
||||
told,
|
||||
tell(TmpFile2),
|
||||
write('@BDD1'),nl,
|
||||
write(VarCnt),nl,
|
||||
write('0'),nl,
|
||||
write(LCnt),nl,
|
||||
told,
|
||||
atomic_concat(['cat ', TmpFile2, ' ', TmpFile1, ' > ', BDDFileName], CMD),
|
||||
shell(CMD),
|
||||
delete_file(TmpFile1),
|
||||
delete_file(TmpFile2).
|
||||
create_bdd_file_with_header(BDDFileName,VarCnt,LCnt,TmpFile1),
|
||||
delete_file_silent(TmpFile1).
|
||||
|
||||
get_next_inter_step(I):-
|
||||
nb_getval(next_inter_step, I),
|
||||
@ -2012,3 +2042,22 @@ mark_deref(DB_Trie):-
|
||||
mark_deref(_).
|
||||
|
||||
% end of Theo
|
||||
|
||||
create_bdd_file_with_header(BDD_File_Name,VarCount,IntermediateSteps,TmpFile) :-
|
||||
open(BDD_File_Name,write,H),
|
||||
% this is the header of the BDD script for problogbdd
|
||||
format(H, '@BDD1~n~q~n0~n~q~n',[VarCount,IntermediateSteps]),
|
||||
|
||||
% append the content of the file TmpFile
|
||||
open(TmpFile,read,H2),
|
||||
|
||||
(
|
||||
repeat,
|
||||
get_byte(H2,C),
|
||||
put_byte(H,C),
|
||||
at_end_of_stream(H2),
|
||||
!
|
||||
),
|
||||
close(H2),
|
||||
|
||||
close(H).
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%
|
||||
% $Date: 2010-09-29 13:24:43 +0200 (Wed, 29 Sep 2010) $
|
||||
% $Revision: 4845 $
|
||||
% $Date: 2010-10-20 18:06:47 +0200 (Wed, 20 Oct 2010) $
|
||||
% $Revision: 4969 $
|
||||
%
|
||||
% This file is part of ProbLog
|
||||
% http://dtai.cs.kuleuven.be/problog
|
||||
@ -205,9 +205,7 @@
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
:- module(utils_learning, [empty_bdd_directory/0,
|
||||
empty_output_directory/0,
|
||||
delete_file_silent/1,
|
||||
slice_n/4]).
|
||||
empty_output_directory/0]).
|
||||
|
||||
|
||||
% load library modules
|
||||
@ -217,6 +215,7 @@
|
||||
% load our own modules
|
||||
:- use_module(os).
|
||||
:- use_module(flags).
|
||||
:- use_module(utils).
|
||||
|
||||
%========================================================================
|
||||
%=
|
||||
@ -246,19 +245,8 @@ empty_output_directory :-
|
||||
concat_path_with_filename(Path,'log.dat',F1),
|
||||
concat_path_with_filename(Path,'out.dat',F2),
|
||||
|
||||
(
|
||||
file_exists(F1)
|
||||
->
|
||||
delete_file_silent(F1);
|
||||
true
|
||||
),
|
||||
|
||||
(
|
||||
file_exists(F2)
|
||||
->
|
||||
delete_file_silent(F2);
|
||||
true
|
||||
),
|
||||
delete_file_silent(F1),
|
||||
delete_file_silent(F2),
|
||||
|
||||
atom_codes('values_', PF1), % 'values_*_q_*.dat'
|
||||
atom_codes('factprobs_', PF2), % 'factprobs_*.pl'
|
||||
@ -272,16 +260,7 @@ empty_output_directory :-
|
||||
empty_output_directory :-
|
||||
throw(error(problog_flag_does_not_exist(output_directory))).
|
||||
|
||||
%========================================================================
|
||||
%=
|
||||
%=
|
||||
%========================================================================
|
||||
|
||||
delete_file_silent(File) :-
|
||||
file_exists(File),
|
||||
delete_file(File),
|
||||
!.
|
||||
delete_file_silent(_).
|
||||
|
||||
%========================================================================
|
||||
%=
|
||||
@ -304,17 +283,3 @@ delete_files_with_matching_prefix([Name|T],Path,Prefixes) :-
|
||||
|
||||
delete_files_with_matching_prefix(T,Path,Prefixes).
|
||||
|
||||
%========================================================================
|
||||
%= Split a list into the first n elements and the tail
|
||||
%= +List +Integer -Prefix -Residuum
|
||||
%========================================================================
|
||||
|
||||
|
||||
slice_n([],_,[],[]) :-
|
||||
!.
|
||||
slice_n([H|T],N,[H|T2],T3) :-
|
||||
N>0,
|
||||
!,
|
||||
N2 is N-1,
|
||||
slice_n(T,N2,T2,T3).
|
||||
slice_n(L,_,[],L).
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%
|
||||
% $Date: 2010-10-05 16:52:13 +0200 (Tue, 05 Oct 2010) $
|
||||
% $Revision: 4869 $
|
||||
% $Date: 2010-10-20 18:06:47 +0200 (Wed, 20 Oct 2010) $
|
||||
% $Revision: 4969 $
|
||||
%
|
||||
% This file is part of ProbLog
|
||||
% http://dtai.cs.kuleuven.be/problog
|
||||
@ -225,6 +225,7 @@
|
||||
:- use_module('problog/os').
|
||||
:- use_module('problog/print_learning').
|
||||
:- use_module('problog/utils_learning').
|
||||
:- use_module('problog/utils').
|
||||
|
||||
% used to indicate the state of the system
|
||||
:- dynamic(values_correct/0).
|
||||
@ -550,10 +551,11 @@ init_learning :-
|
||||
init_learning :-
|
||||
check_examples,
|
||||
|
||||
empty_output_directory,
|
||||
logger_write_header,
|
||||
|
||||
format_learning(1,'Initializing everything~n',[]),
|
||||
empty_output_directory,
|
||||
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
% Delete the BDDs from the previous run if they should
|
||||
@ -1031,6 +1033,7 @@ mse_testset :-
|
||||
(
|
||||
format_learning(2,'MSE_Test ',[]),
|
||||
update_values,
|
||||
bb_put(llh_test_queries,0.0),
|
||||
findall(SquaredError,
|
||||
(user:test_example(QueryID,_Query,QueryProb,Type),
|
||||
once(update_query(QueryID,'+',probability)),
|
||||
@ -1041,7 +1044,10 @@ mse_testset :-
|
||||
->
|
||||
SquaredError is (CurrentProb-QueryProb)**2;
|
||||
SquaredError = 0.0
|
||||
)
|
||||
),
|
||||
bb_get(llh_test_queries,Old_LLH_Test_Queries),
|
||||
New_LLH_Test_Queries is Old_LLH_Test_Queries+log(CurrentProb),
|
||||
bb_put(llh_test_queries,New_LLH_Test_Queries)
|
||||
),
|
||||
AllSquaredErrors),
|
||||
|
||||
@ -1050,10 +1056,12 @@ mse_testset :-
|
||||
min_list(AllSquaredErrors,MinError),
|
||||
max_list(AllSquaredErrors,MaxError),
|
||||
MSE is SumAllSquaredErrors/Length,
|
||||
bb_delete(llh_test_queries,LLH_Test_Queries),
|
||||
|
||||
logger_set_variable(mse_testset,MSE),
|
||||
logger_set_variable(mse_min_testset,MinError),
|
||||
logger_set_variable(mse_max_testset,MaxError),
|
||||
logger_set_variable(llh_test_queries,LLH_Test_Queries),
|
||||
format_learning(2,' (~8f)~n',[MSE])
|
||||
); true
|
||||
).
|
||||
@ -1232,6 +1240,7 @@ gradient_descent :-
|
||||
bb_put(mse_train_sum, 0.0),
|
||||
bb_put(mse_train_min, 0.0),
|
||||
bb_put(mse_train_max, 0.0),
|
||||
bb_put(llh_training_queries, 0.0),
|
||||
|
||||
problog_flag(alpha,Alpha),
|
||||
logger_set_variable(alpha,Alpha),
|
||||
@ -1267,12 +1276,15 @@ gradient_descent :-
|
||||
bb_get(mse_train_sum,Old_MSE_Train_Sum),
|
||||
bb_get(mse_train_min,Old_MSE_Train_Min),
|
||||
bb_get(mse_train_max,Old_MSE_Train_Max),
|
||||
bb_get(llh_training_queries,Old_LLH_Training_Queries),
|
||||
New_MSE_Train_Sum is Old_MSE_Train_Sum+Squared_Error,
|
||||
New_MSE_Train_Min is min(Old_MSE_Train_Min,Squared_Error),
|
||||
New_MSE_Train_Max is max(Old_MSE_Train_Max,Squared_Error),
|
||||
New_LLH_Training_Queries is Old_LLH_Training_Queries+log(BDDProb),
|
||||
bb_put(mse_train_sum,New_MSE_Train_Sum),
|
||||
bb_put(mse_train_min,New_MSE_Train_Min),
|
||||
bb_put(mse_train_max,New_MSE_Train_Max),
|
||||
bb_put(llh_training_queries,New_LLH_Training_Queries),
|
||||
|
||||
|
||||
|
||||
@ -1368,11 +1380,13 @@ gradient_descent :-
|
||||
bb_delete(mse_train_sum,MSE_Train_Sum),
|
||||
bb_delete(mse_train_min,MSE_Train_Min),
|
||||
bb_delete(mse_train_max,MSE_Train_Max),
|
||||
bb_delete(llh_training_queries,LLH_Training_Queries),
|
||||
MSE is MSE_Train_Sum/Example_Count,
|
||||
|
||||
logger_set_variable(mse_trainingset,MSE),
|
||||
logger_set_variable(mse_min_trainingset,MSE_Train_Min),
|
||||
logger_set_variable(mse_max_trainingset,MSE_Train_Max),
|
||||
logger_set_variable(llh_training_queries,LLH_Training_Queries),
|
||||
|
||||
format_learning(2,'~n',[]),
|
||||
|
||||
@ -1670,7 +1684,9 @@ init_logger :-
|
||||
logger_define_variable(ground_truth_mindiff,float),
|
||||
logger_define_variable(ground_truth_maxdiff,float),
|
||||
logger_define_variable(learning_rate,float),
|
||||
logger_define_variable(alpha,float).
|
||||
logger_define_variable(alpha,float),
|
||||
logger_define_variable(llh_training_queries,float),
|
||||
logger_define_variable(llh_test_queries,float).
|
||||
|
||||
:- initialization(init_flags).
|
||||
:- initialization(init_logger).
|
||||
|
||||
Reference in New Issue
Block a user