diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
Tiago Gomes 2012-12-18 12:11:45 +00:00
parent c7a4adcefb
commit 4b0acbf8c1
3 changed files with 44 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CLPBN/clpbn.yap
View File

@ -74,7 +74,7 @@
check_if_horus_ground_solver_done/1, check_if_horus_ground_solver_done/1,
init_horus_ground_solver/5, init_horus_ground_solver/5,
run_horus_ground_solver/3, run_horus_ground_solver/3,
finalize_horus_ground_solver/1 end_horus_ground_solver/1
]). ]).
:- use_module('clpbn/horus_lifted', :- use_module('clpbn/horus_lifted',
@ -82,7 +82,7 @@
check_if_horus_lifted_solver_done/1, check_if_horus_lifted_solver_done/1,
init_horus_lifted_solver/4, init_horus_lifted_solver/4,
run_horus_lifted_solver/3, run_horus_lifted_solver/3,
finalize_horus_lifted_solver/1 end_horus_lifted_solver/1
]). ]).
%% :- use_module('clpbn/bnt', %% :- use_module('clpbn/bnt',
@ -723,7 +723,7 @@ pfl_run_solver(LVs, LPs, State, cbp) :- !,
pfl_end_solver(State) :- pfl_end_solver(State) :-
(em_solver(hve) ; em_solver(bp) ; em_solver(cbp)), (em_solver(hve) ; em_solver(bp) ; em_solver(cbp)),
finalize_horus_ground_solver(State). end_horus_ground_solver(State).
pfl_end_solver(_State). pfl_end_solver(_State).

38
packages/CLPBN/clpbn/horus_ground.yap
View File

@ -12,53 +12,40 @@
check_if_horus_ground_solver_done/1, check_if_horus_ground_solver_done/1,
init_horus_ground_solver/5, init_horus_ground_solver/5,
run_horus_ground_solver/3, run_horus_ground_solver/3,
finalize_horus_ground_solver/1 end_horus_ground_solver/1
]). ]).
:- use_module(horus, :- use_module(horus,
[cpp_create_ground_network/4, [cpp_create_ground_network/4,
cpp_set_factors_params/2, cpp_set_factors_params/2,
cpp_run_ground_solver/3, cpp_run_ground_solver/3,
cpp_set_vars_information/2, cpp_free_ground_network/1,
cpp_free_ground_network/1 cpp_set_vars_information/2
]). ]).
:- use_module(library('clpbn/dists'), :- use_module(library('clpbn/numbers')).
[dist/4,
get_dist_domain/2,
get_dist_domain_size/2,
get_dist_params/2
]).
:- use_module(library('clpbn/display'), :- use_module(library('clpbn/display'),
[clpbn_bind_vals/3]). [clpbn_bind_vals/3]).
:- use_module(library('clpbn/numbers')). :- use_module(library(pfl),
[skolem/2]).
:- use_module(library(charsio), :- use_module(library(charsio),
[term_to_atom/2]). [term_to_atom/2]).
:- use_module(library(pfl),
[skolem/2]).
:- use_module(library(maplist)). :- use_module(library(maplist)).
:- use_module(library(lists)).
:- use_module(library(atts)).
:- use_module(library(bhash)).
call_horus_ground_solver(QueryVars, QueryKeys, AllKeys, Factors, Evidence, Output) :- call_horus_ground_solver(QueryVars, QueryKeys, AllKeys, Factors, Evidence, Output) :-
init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State), init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State),
run_horus_ground_solver([QueryKeys], Solutions, State), run_horus_ground_solver([QueryKeys], Solutions, State),
clpbn_bind_vals([QueryVars], Solutions, Output), clpbn_bind_vals([QueryVars], Solutions, Output),
finalize_horus_ground_solver(State). end_horus_ground_solver(State).
run_horus_ground_solver(QueryKeys, Solutions, state(Network,Hash,Id)) :- run_horus_ground_solver(QueryKeys, Solutions, state(Network,Hash,Id)) :-
%get_dists_parameters(DistIds, DistsParams), %maplist(get_dists_parameters, DistIds, DistsParams),
%cpp_set_factors_params(Network, DistsParams), %cpp_set_factors_params(Network, DistsParams),
lists_of_keys_to_ids(QueryKeys, QueryIds, Hash, _, Id, _), lists_of_keys_to_ids(QueryKeys, QueryIds, Hash, _, Id, _),
cpp_run_ground_solver(Network, QueryIds, Solutions). cpp_run_ground_solver(Network, QueryIds, Solutions).
@ -74,8 +61,7 @@ init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, state(Network,Ha
cpp_set_vars_information(KeysAtoms, StatesNames). cpp_set_vars_information(KeysAtoms, StatesNames).
% TODO this is not beeing called! end_horus_ground_solver(state(Network,_Hash,_Id)) :-
finalize_horus_ground_solver(state(Network,_Hash,_Id)) :-
cpp_free_ground_network(Network). cpp_free_ground_network(Network).
@ -88,9 +74,3 @@ get_var_information(_:Key, Domain) :- !,
get_var_information(Key, Domain) :- get_var_information(Key, Domain) :-
skolem(Key, Domain). skolem(Key, Domain).
%get_dists_parameters([],[]).
%get_dists_parameters([Id|Ids], [dist(Id, Params)|DistsInfo]) :-
% get_dist_params(Id, Params),
% get_dists_parameters(Ids, DistsInfo).

77
packages/CLPBN/clpbn/horus_lifted.yap
View File

@ -12,7 +12,7 @@
check_if_horus_lifted_solver_done/1, check_if_horus_lifted_solver_done/1,
init_horus_lifted_solver/4, init_horus_lifted_solver/4,
run_horus_lifted_solver/3, run_horus_lifted_solver/3,
finalize_horus_lifted_solver/1 end_horus_lifted_solver/1
]). ]).
:- use_module(horus, :- use_module(horus,
@ -25,49 +25,48 @@
:- use_module(library('clpbn/display'), :- use_module(library('clpbn/display'),
[clpbn_bind_vals/3]). [clpbn_bind_vals/3]).
:- use_module(library('clpbn/dists'),
[get_dist_params/2]).
:- use_module(library(pfl), :- use_module(library(pfl),
[factor/6, [factor/6,
skolem/2, skolem/2,
get_pfl_parameters/2 get_pfl_parameters/2
]). ]).
:- use_module(library(maplist)).
call_horus_lifted_solver(QueryVars, AllVars, Output) :- call_horus_lifted_solver(QueryVars, AllVars, Output) :-
init_horus_lifted_solver(_, AllVars, _, State), init_horus_lifted_solver(_, AllVars, _, State),
run_horus_lifted_solver(QueryVars, Solutions, State), run_horus_lifted_solver(QueryVars, Solutions, State),
clpbn_bind_vals(QueryVars, Solutions, Output), clpbn_bind_vals(QueryVars, Solutions, Output),
finalize_horus_lifted_solver(State). end_horus_lifted_solver(State).
init_horus_lifted_solver(_, AllVars, _, state(ParfactorList, DistIds)) :- init_horus_lifted_solver(_, AllVars, _, state(Network, DistIds)) :-
get_parfactors(Parfactors), get_parfactors(Parfactors),
get_dist_ids(Parfactors, DistIds0), get_dist_ids(Parfactors, DistIds0),
sort(DistIds0, DistIds), sort(DistIds0, DistIds),
get_observed_vars(AllVars, ObservedVars), get_observed_keys(AllVars, ObservedKeys),
%writeln(parfactors:Parfactors:'\n'), %writeln(parfactors:Parfactors:'\n'),
%writeln(evidence:ObservedVars:'\n'), %writeln(evidence:ObservedKeys:'\n'),
cpp_create_lifted_network(Parfactors, ObservedVars, ParfactorList). cpp_create_lifted_network(Parfactors, ObservedKeys, Network).
run_horus_lifted_solver(QueryVars, Solutions, state(ParfactorList, DistIds)) :- run_horus_lifted_solver(QueryVars, Solutions, state(Network, DistIds)) :-
get_query_keys(QueryVars, QueryKeys), maplist(get_query_keys, QueryVars, QueryKeys),
get_dists_parameters(DistIds, DistsParams), get_dists_parameters(DistIds, DistsParams),
%writeln(distparams1:DistsParams),
%maplist(get_pfl_parameters, DistIds,DistsParams2),
%writeln(distparams1:DistsParams2),
%writeln(dists:DistsParams), writeln(''), %writeln(dists:DistsParams), writeln(''),
cpp_set_parfactors_params(ParfactorList, DistsParams), cpp_set_parfactors_params(Network, DistsParams),
cpp_run_lifted_solver(ParfactorList, QueryKeys, Solutions). cpp_run_lifted_solver(Network, QueryKeys, Solutions).
finalize_horus_lifted_solver(state(ParfactorList, _)) :- end_horus_lifted_solver(state(Network, _)) :-
cpp_free_lifted_network(ParfactorList). cpp_free_lifted_network(Network).
:- table get_parfactors/1.
% %
% enumerate all parfactors and enumerate their domain as tuples. % Enumerate all parfactors and enumerate their domain as tuples.
% %
% output is list of pf( % output is list of pf(
% Id: an unique number % Id: an unique number
@ -76,33 +75,27 @@ finalize_horus_lifted_solver(state(ParfactorList, _)) :-
% Phi: the table following usual CLP(BN) convention % Phi: the table following usual CLP(BN) convention
% Tuples: ground bindings for variables in Vs, of the form [fv(x,y)] % Tuples: ground bindings for variables in Vs, of the form [fv(x,y)]
% %
:- table get_parfactors/1.
get_parfactors(Factors) :- get_parfactors(Factors) :-
findall(F, is_factor(F), Factors). findall(F, is_factor(F), Factors).
is_factor(pf(Id, Ks, Rs, Phi, Tuples)) :- is_factor(pf(Id, Ks, Rs, Phi, Tuples)) :-
factor(_Type, Id, Ks, Vs, Table, Constraints), factor(_Type, Id, Ks, Vs, Table, Constraints),
get_ranges(Ks,Rs), maplist(get_range, Ks, Rs),
Table \= avg, Table \= avg,
gen_table(Table, Phi), gen_table(Table, Phi),
all_tuples(Constraints, Vs, Tuples). all_tuples(Constraints, Vs, Tuples).
get_ranges([],[]). get_range(K, Range) :-
get_ranges(K.Ks, Range.Rs) :- !,
skolem(K,Domain), skolem(K,Domain),
length(Domain,Range), length(Domain,Range).
get_ranges(Ks, Rs).
gen_table(Table, Phi) :- gen_table(Table, Phi) :-
( ( is_list(Table) -> Phi = Table ; call(user:Table, Phi) ).
is_list(Table)
->
Phi = Table
;
call(user:Table, Phi)
).
all_tuples(Constraints, Tuple, Tuples) :- all_tuples(Constraints, Tuple, Tuples) :-
@ -120,26 +113,20 @@ get_dist_ids(pf(Id, _, _, _, _).Parfactors, Id.DistIds) :-
get_dist_ids(Parfactors, DistIds). get_dist_ids(Parfactors, DistIds).
get_observed_vars([], []). get_observed_keys([], []).
get_observed_vars(V.AllAttVars, [K:E|ObservedVars]) :- get_observed_keys(V.AllAttVars, [K:E|ObservedKeys]) :-
clpbn:get_atts(V,[key(K)]), clpbn:get_atts(V,[key(K)]),
( clpbn:get_atts(V,[evidence(E)]) ; pfl:evidence(K,E) ), !, ( clpbn:get_atts(V,[evidence(E)]) ; pfl:evidence(K,E) ), !,
get_observed_vars(AllAttVars, ObservedVars). get_observed_keys(AllAttVars, ObservedKeys).
get_observed_vars(V.AllAttVars, ObservedVars) :- get_observed_keys(V.AllAttVars, ObservedKeys) :-
clpbn:get_atts(V,[key(_K)]), !, clpbn:get_atts(V,[key(_K)]), !,
get_observed_vars(AllAttVars, ObservedVars). get_observed_keys(AllAttVars, ObservedKeys).
get_query_keys([], []). get_query_keys([], []).
get_query_keys(E1.L1, E2.L2) :- get_query_keys(V.AttVars, K.Ks) :-
get_query_keys_2(E1,E2), clpbn:get_atts(V,[key(K)]), !,
get_query_keys(L1, L2). get_query_keys(AttVars, Ks).
get_query_keys_2([], []).
get_query_keys_2(V.AttVars, [RV|RVs]) :-
clpbn:get_atts(V,[key(RV)]), !,
get_query_keys_2(AttVars, RVs).
get_dists_parameters([], []). get_dists_parameters([], []).