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

fix problem with conditional_probability/3 and evidence (obs from Andrea Sterbini).

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-10-02 14:26:42 +01:00
parent 20080c0a24
commit e6fb32d9ca
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/CLPBN/clpbn.yap
View File

@ -613,6 +613,9 @@ clpbn_finalize_solver(_State).
probability(Goal, Prob) :- probability(Goal, Prob) :-
findall(Prob, do_probability(Goal, [], Prob), [Prob]). findall(Prob, do_probability(Goal, [], Prob), [Prob]).
conditional_probability(Goal, ListOfGoals, Prob) :-
\+ ground(Goal),
throw(error(ground(Goal),conditional_probability(Goal, ListOfGoals, Prob))).
conditional_probability(Goal, ListOfGoals, Prob) :- conditional_probability(Goal, ListOfGoals, Prob) :-
\+ ground(ListOfGoals), !, \+ ground(ListOfGoals), !,
throw(error(ground(ListOfGoals),conditional_probability(Goal, ListOfGoals, Prob))). throw(error(ground(ListOfGoals),conditional_probability(Goal, ListOfGoals, Prob))).
@ -622,7 +625,7 @@ conditional_probability(Goal, ListOfGoals, Prob) :-
do_probability(Goal, ListOfGoals, Prob) :- do_probability(Goal, ListOfGoals, Prob) :-
evidence_to_var(Goal, C, NGoal, V), evidence_to_var(Goal, C, NGoal, V),
call_residue(run( ListOfGoals, NGoal), Vars), !, call_residue(run( ListOfGoals, NGoal), Vars), !,
match_probability(Vars, C, V, Prob). match_probability(Vars, NGoal, C, V, Prob).
run(ListOfGoals,Goal) :- run(ListOfGoals,Goal) :-
do(ListOfGoals), do(ListOfGoals),
@ -648,11 +651,28 @@ variabilise_last([Arg], Arg, [V], V).
variabilise_last([Arg1,Arg2|Args], Arg, Arg1.NArgs, V) :- variabilise_last([Arg1,Arg2|Args], Arg, Arg1.NArgs, V) :-
variabilise_last(Arg2.Args, Arg, NArgs, V). variabilise_last(Arg2.Args, Arg, NArgs, V).
match_probability([p(V0=C)=Prob|_], C, V, Prob) :- match_probability([], Goal, C, V, Prob) :-
/* there is evidence, so values are nil and V is bound */
nonvar(V), !,
goal_to_key(Goal, Skolem),
pfl:skolem(Skolem, Domain),
member(C, Domain),
( C == V -> Prob = 1.0 ; Prob = 0.0 ).
match_probability(VPs, Goal, C, V, Prob) :-
match_probabilities(VPs, Goal, C, V, Prob).
match_probabilities([p(V0=C)=Prob|_], _, C, V, Prob) :-
V0 == V, V0 == V,
!. !.
match_probability([_|Probs], C, V, Prob) :- match_probabilies([_|Probs], G, C, V, Prob) :-
match_probability(Probs, C, V, Prob). match_probability(Probs, G, C, V, Prob).
goal_to_key(_:Goal, Skolem) :-
goal_to_key(Goal, Skolem).
goal_to_key(Goal, Skolem) :-
functor(Goal, Na, Ar),
Ar1 is Ar-1,
functor(Skolem, Na, Ar1).
:- use_parfactors(on) -> true ; assert(use_parfactors(off)). :- use_parfactors(on) -> true ; assert(use_parfactors(off)).

1
packages/CLPBN/pfl.yap
View File

@ -22,6 +22,7 @@
:- reexport(library(clpbn), :- reexport(library(clpbn),
[clpbn_flag/2 as pfl_flag, [clpbn_flag/2 as pfl_flag,
set_clpbn_flag/2 as set_pfl_flag, set_clpbn_flag/2 as set_pfl_flag,
conditional_probability/3,
pfl_init_solver/6, pfl_init_solver/6,
pfl_run_solver/4]). pfl_run_solver/4]).