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

small interface fixes, use influences

Browse Source
This commit is contained in:
Vitor Santos Costa 2008-11-01 11:51:36 +00:00
parent 0ff1552370
commit c6bb7e9dfe
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CLPBN/clpbn/gibbs.yap
View File

@ -10,7 +10,7 @@
:- module(clpbn_gibbs, :- module(clpbn_gibbs,
[gibbs/3, [gibbs/3,
check_if_gibbs_done/1, check_if_gibbs_done/1,
init_gibbs_solver/3, init_gibbs_solver/4,
run_gibbs_solver/3]). run_gibbs_solver/3]).
:- use_module(library(rbtrees), :- use_module(library(rbtrees),
@ -49,6 +49,11 @@
:- use_module(library('clpbn/display'), [ :- use_module(library('clpbn/display'), [
clpbn_bind_vals/3]). clpbn_bind_vals/3]).
:- use_module(library('clpbn/connected'),
[
influences/4
]).
:- dynamic gibbs_params/3. :- dynamic gibbs_params/3.
:- dynamic explicit/1. :- dynamic explicit/1.
@ -59,19 +64,21 @@
% list of attributed variables % list of attributed variables
% %
gibbs(LVs,Vs0,AllDiffs) :- gibbs(LVs,Vs0,AllDiffs) :-
init_gibbs_solver(LVs, Vs0, Vs), init_gibbs_solver(LVs, Vs0, AllDiffs, Vs),
(clpbn:output(xbif(XBifStream)) -> clpbn2xbif(XBifStream,vel,Vs) ; true), (clpbn:output(xbif(XBifStream)) -> clpbn2xbif(XBifStream,vel,Vs) ; true),
(clpbn:output(gviz(XBifStream)) -> clpbn2gviz(XBifStream,vel,Vs,LVs) ; true), (clpbn:output(gviz(XBifStream)) -> clpbn2gviz(XBifStream,vel,Vs,LVs) ; true),
run_gibbs_solver(LVs, Vs, LPs), run_gibbs_solver(LVs, LPs, Vs),
clpbn_bind_vals(LVs,LPs,AllDiffs), clpbn_bind_vals(LVs,LPs,AllDiffs),
clean_up. clean_up.
init_gibbs_solver(_, Vs0, Vs) :- init_gibbs_solver(GoalVs, Vs0, _, Vs) :-
clean_up, clean_up,
term_variables(GoalVs, LVs),
check_for_hidden_vars(Vs0, Vs0, Vs1), check_for_hidden_vars(Vs0, Vs0, Vs1),
sort(Vs1,Vs). influences(Vs1, LVs, _, Vs2),
sort(Vs2,Vs).
run_gibbs_solver(LVs, Vs, LPs) :- run_gibbs_solver(LVs, LPs, Vs) :-
initialise(Vs, Graph, LVs, OutputVars, VarOrder), initialise(Vs, Graph, LVs, OutputVars, VarOrder),
% writeln(Graph), % writeln(Graph),
% write_pars(Vs), % write_pars(Vs),