From 85e9da13322eb1fba09e94368fc637c6a6ed10d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Tue, 2 Oct 2012 08:49:16 +0100 Subject: [PATCH] hve with em works now. --- packages/CLPBN/examples/learning/sprinkler_params.yap | 4 ++-- packages/CLPBN/learning/em.yap | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/CLPBN/examples/learning/sprinkler_params.yap b/packages/CLPBN/examples/learning/sprinkler_params.yap index 365ae2649..ba3b3a254 100644 --- a/packages/CLPBN/examples/learning/sprinkler_params.yap +++ b/packages/CLPBN/examples/learning/sprinkler_params.yap @@ -20,9 +20,9 @@ data(t,f,t,t). %:- clpbn:set_clpbn_flag(em_solver,gibbs). %:- clpbn:set_clpbn_flag(em_solver,jt). -%:- clpbn:set_clpbn_flag(em_solver,hve). +:- clpbn:set_clpbn_flag(em_solver,hve). %:- clpbn:set_clpbn_flag(em_solver,bp). -:- clpbn:set_clpbn_flag(em_solver,ve). +%:- clpbn:set_clpbn_flag(em_solver,ve). timed_main :- statistics(runtime, _), diff --git a/packages/CLPBN/learning/em.yap b/packages/CLPBN/learning/em.yap index 087f96057..335612442 100644 --- a/packages/CLPBN/learning/em.yap +++ b/packages/CLPBN/learning/em.yap @@ -125,7 +125,6 @@ setup_em_network(Items, Solver, state( AllDists, AllDistInstances, MargVars, Sol run_examples(user:Exs, Keys, Factors, EList) :- Exs = [_:_|_], !, - trace, findall(ex(EKs, EFs, EEs), run_example(Exs, EKs, EFs, EEs), VExs), foldl4(join_example, VExs, [], Keys, [], Factors, [], EList, 0, _). @@ -206,9 +205,6 @@ process_factor(Ev, f(bayes,Id,Ks), i(Id, Ks, Cases, NonEvs)) :- fetch_evidence(Ev, K, E, NonEvs, NonEvs) :- b_hash_lookup(K, E, Ev), !. -fetch_evidence(_Ev, _Id:K, Ns, NonEvs, [K|NonEvs]) :- - pfl:skolem(K,D), !, - foldl(domain_to_number, D, Ns, 0, _). fetch_evidence(_Ev, K, Ns, NonEvs, [K|NonEvs]) :- pfl:skolem(K,D), foldl(domain_to_number, D, Ns, 0, _).