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

syntax error fixing in em.yap

Browse Source
This commit is contained in:
Vitor Santos Costa 2008-09-30 00:04:07 +01:00
parent 3b811d0d70
commit 75cd0c619c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CLPBN/learning/em.yap
View File

@ -26,7 +26,7 @@ init_em(Items, state(AllVars, AllDists, AllDistInstances)) :-
different_dists(AllVars, AllDists, AllDistInstances). different_dists(AllVars, AllDists, AllDistInstances).
% loop for as long as you want. % loop for as long as you want.
em_loop(MaxIts, Likelihood State, _, _ MaxIts, Likelihood) :- !. em_loop(MaxIts, Likelihood, State, _, _, MaxIts, Likelihood) :- !.
em_loop(Its, Likelihood0, State, MaxError, MaxIts, LikelihoodF) :- em_loop(Its, Likelihood0, State, MaxError, MaxIts, LikelihoodF) :-
estimate(State), estimate(State),
maximise(State, Likelihood), maximise(State, Likelihood),
@ -49,7 +49,7 @@ different_dists(AllVars, AllDists, AllInfo) :-
sort(Dists0, Dists1), sort(Dists0, Dists1),
group(Dists1, AllInfo). group(Dists1, AllInfo).
group([], []) :- group([], []).
group([i(Id,V,Ps)|Dists1], [Id-[[V|Ps]|Extra]|AllInfo]) :- group([i(Id,V,Ps)|Dists1], [Id-[[V|Ps]|Extra]|AllInfo]) :-
same_id(Dists1, Id, Extra, Rest), same_id(Dists1, Id, Extra, Rest),
group(Rest, AllInfo). group(Rest, AllInfo).
@ -85,7 +85,7 @@ maximise(state(_,_,DistInstances), Tables, Likelihood) :-
compute_parameters([], [], Lik, Lik). compute_parameters([], [], Lik, Lik).
compute_parameters([Id-Samples|Dists], [Tab|Tables], Lik0, Lik) :- compute_parameters([Id-Samples|Dists], [Tab|Tables], Lik0, Lik) :-
empty_dist(Id, NewTable), empty_dist(Id, NewTable),
add_samples(Samples, NewTable). add_samples(Samples, NewTable),
normalise_table(Id, NewTable), normalise_table(Id, NewTable),
compute_parameters(Dists, Tables, Lik0, Lik). compute_parameters(Dists, Tables, Lik0, Lik).
@ -95,7 +95,7 @@ add_samples([S|Samples], Table) :-
matrix_add(Table, Pos, Tot), matrix_add(Table, Pos, Tot),
fail. fail.
add_samples([_|Samples], Table) :- add_samples([_|Samples], Table) :-
add_samples(Samples, Table) add_samples(Samples, Table).
run_sample([], Tot, [], Tot). run_sample([], Tot, [], Tot).
run_sample([V|S], W0, [P|Pos], Tot) :- run_sample([V|S], W0, [P|Pos], Tot) :-