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

Clean ups and don't forget cbp

Browse Source
This commit is contained in:
Tiago Gomes 2012-12-15 00:29:03 +00:00
parent 1174486576
commit 55292ab745
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/CLPBN/clpbn.yap
View File

@ -589,16 +589,22 @@ clpbn_run_solver(pcg, LVs, LPs, State) :-
% %
% This is a routine to start a solver, called by the learning procedures (ie, em). % This is a routine to start a solver, called by the learning procedures (ie, em).
% %
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, bdd) :-
init_bdd_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State).
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, ve) :- pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, ve) :-
init_ve_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State). init_ve_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State).
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, bp) :- pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, bdd) :-
init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State). init_bdd_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State).
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, hve) :- pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, hve) :-
clpbn_horus:set_horus_flag(ground_solver, ve),
init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State).
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, bp) :-
clpbn_horus:set_horus_flag(ground_solver, bp),
init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State).
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, cbp) :-
clpbn_horus:set_horus_flag(ground_solver, cbp),
init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State). init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State).
pfl_run_solver(LVs, LPs, State, ve) :- pfl_run_solver(LVs, LPs, State, ve) :-
@ -607,12 +613,14 @@ pfl_run_solver(LVs, LPs, State, ve) :-
pfl_run_solver(LVs, LPs, State, bdd) :- pfl_run_solver(LVs, LPs, State, bdd) :-
run_bdd_ground_solver(LVs, LPs, State). run_bdd_ground_solver(LVs, LPs, State).
pfl_run_solver(LVs, LPs, State, hve),
run_horus_ground_solver(LVs, LPs, State, hve).
pfl_run_solver(LVs, LPs, State, bp) :- pfl_run_solver(LVs, LPs, State, bp) :-
run_horus_ground_solver(LVs, LPs, State, bp). run_horus_ground_solver(LVs, LPs, State, bp).
pfl_run_solver(LVs, LPs, State, hve) :- pfl_run_solver(LVs, LPs, State, cbp) :-
run_horus_ground_solver(LVs, LPs, State, cbp).
run_horus_ground_solver(LVs, LPs, State, hve).
add_keys(Key1+V1,_Key2,Key1+V1). add_keys(Key1+V1,_Key2,Key1+V1).