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

Put solver always as the first argument

Browse Source
This commit is contained in:
Tiago Gomes 2013-01-15 12:27:21 +00:00
parent cac748d41a
commit 6cad8969c6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/CLPBN/clpbn.yap
View File

@ -699,48 +699,48 @@ pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State) :-
; ;
format("Error: solver '~w' is unknown.", [Solver]), fail format("Error: solver '~w' is unknown.", [Solver]), fail
), ),
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, Solver). pfl_init_solver(Solver, QueryKeys, AllKeys, Factors, Evidence, State).
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, ve) :- !, pfl_init_solver(ve, QueryKeys, AllKeys, Factors, Evidence, State) :- !,
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, hve) :- !, pfl_init_solver(hve, QueryKeys, AllKeys, Factors, Evidence, State) :- !,
clpbn_horus:set_horus_flag(ground_solver, hve), clpbn_horus:set_horus_flag(ground_solver, hve),
init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State). init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State).
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, bdd) :- !, pfl_init_solver(bdd, QueryKeys, AllKeys, Factors, Evidence, State) :- !,
init_bdd_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State). init_bdd_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State).
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, bp) :- !, pfl_init_solver(bp, QueryKeys, AllKeys, Factors, Evidence, State) :- !,
clpbn_horus:set_horus_flag(ground_solver, bp), clpbn_horus:set_horus_flag(ground_solver, bp),
init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State). init_horus_ground_solver(QueryKeys, AllKeys, Factors, Evidence, State).
pfl_init_solver(QueryKeys, AllKeys, Factors, Evidence, State, cbp) :- !, pfl_init_solver(cbp, QueryKeys, AllKeys, Factors, Evidence, State) :- !,
clpbn_horus:set_horus_flag(ground_solver, 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_init_solver(_, _, _, _, _, Solver) :- pfl_init_solver(Solver, _, _, _, _, _) :-
format("Error: solver '~w' can't be used for learning.", [Solver]), format("Error: solver '~w' can't be used for learning.", [Solver]),
fail. fail.
pfl_run_solver(LVs, LPs, State) :- pfl_run_solver(LVs, LPs, State) :-
em_solver(Solver), em_solver(Solver),
pfl_run_solver(LVs, LPs, State, Solver). pfl_run_solver(Solver, LVs, LPs, State).
pfl_run_solver(LVs, LPs, State, ve) :- !, pfl_run_solver(ve, LVs, LPs, State) :- !,
run_ve_ground_solver(LVs, LPs, State). run_ve_ground_solver(LVs, LPs, State).
pfl_run_solver(LVs, LPs, State, hve) :- !, pfl_run_solver(hve, LVs, LPs, State) :- !,
run_horus_ground_solver(LVs, LPs, State). run_horus_ground_solver(LVs, LPs, State).
pfl_run_solver(LVs, LPs, State, bdd) :- !, pfl_run_solver(bdd, LVs, LPs, State) :- !,
run_bdd_ground_solver(LVs, LPs, State). run_bdd_ground_solver(LVs, LPs, State).
pfl_run_solver(LVs, LPs, State, bp) :- !, pfl_run_solver(bp, LVs, LPs, State) :- !,
run_horus_ground_solver(LVs, LPs, State). run_horus_ground_solver(LVs, LPs, State).
pfl_run_solver(LVs, LPs, State, cbp) :- !, pfl_run_solver(cbp, LVs, LPs, State) :- !,
run_horus_ground_solver(LVs, LPs, State). run_horus_ground_solver(LVs, LPs, State).
pfl_end_solver(State) :- pfl_end_solver(State) :-