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

Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

This commit is contained in:
Vitor Santos Costa 2013-01-11 16:58:43 +00:00
parent f83379648c 1bb1138b3a
commit a913523d6a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/CLPBN/learning/em.yap
View File

@ -134,14 +134,15 @@ setup_em_network(Items, state(AllDists, AllDistInstances, MargVars, SolverState)
clpbn_init_solver(MargVars, AllVars, _, SolverState). clpbn_init_solver(MargVars, AllVars, _, SolverState).
run_examples(user:Exs, Keys, Factors, EList) :- run_examples(user:Exs, Keys, Factors, EList) :-
Exs = [[_]|_], !, Exs = [[_|_]|_], !,
foldl(add_key, Exs, ,KExs, 1, _), foldl(add_key, Exs, KExs, 1, _),
findall(ex(EKs, EFs, EEs), run_example(Exs, EKs, EFs, EEs), VExs), findall(ex(EKs, EFs, EEs), run_example(KExs, EKs, EFs, EEs), VExs),
foldl4(join_example, VExs, [], Keys, [], Factors, [], EList, 0, _). foldl4(join_example, VExs, [], Keys, [], Factors, [], EList, 0, _).
run_examples(Items, Keys, Factors, EList) :- run_examples(Items, Keys, Factors, EList) :-
run_ex(Items, Keys, Factors, EList). run_ex(Items, Keys, Factors, EList).
add_key(Ex, I:Ex, I, I1) :- I1 is I+1. add_key(Ex, I:Ex, I, I1) :-
I1 is I+1.
join_example( ex(EKs, EFs, EEs), Keys0, Keys, Factors0, Factors, EList0, EList, I0, I) :- join_example( ex(EKs, EFs, EEs), Keys0, Keys, Factors0, Factors, EList0, EList, I0, I) :-
I is I0+1, I is I0+1,
@ -191,7 +192,7 @@ em_loop(Its, Likelihood0, State, MaxError, MaxIts, LikelihoodF, FTables) :-
; ;
Its1 is Its+1, Its1 is Its+1,
em_loop(Its1, Likelihood, State, MaxError, MaxIts, LikelihoodF, FTables) em_loop(Its1, Likelihood, State, MaxError, MaxIts, LikelihoodF, FTables)
). ).
ltables([], []). ltables([], []).
ltables([Id-T|Tables], [Key-LTable|FTables]) :- ltables([Id-T|Tables], [Key-LTable|FTables]) :-