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

disable bayes ball for now

Browse Source
This commit is contained in:
Tiago Gomes 2012-04-30 11:20:02 +01:00
parent 185cbe9c73
commit 2fa06da3c9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/CLPBN/clpbn/bp/HorusYap.cpp
View File

@ -376,16 +376,17 @@ void runVeSolver (
for (unsigned i = 0; i < tasks.size(); i++) { for (unsigned i = 0; i < tasks.size(); i++) {
FactorGraph* mfg = fg; FactorGraph* mfg = fg;
if (fg->isFromBayesNetwork()) { if (fg->isFromBayesNetwork()) {
mfg = BayesBall::getMinimalFactorGraph (*fg, tasks[i]); // mfg = BayesBall::getMinimalFactorGraph (*fg, tasks[i]);
} }
// VarElimSolver solver (*mfg); // VarElimSolver solver (*mfg);
VarElimSolver solver (*fg); //FIXME VarElimSolver solver (*fg); //FIXME
if (Globals::verbosity > 0 && i == 0) { if (Globals::verbosity > 0 && i == 0) {
solver.printSolverFlags(); solver.printSolverFlags();
cout << endl;
} }
results.push_back (solver.solveQuery (tasks[i])); results.push_back (solver.solveQuery (tasks[i]));
if (fg->isFromBayesNetwork()) { if (fg->isFromBayesNetwork()) {
delete mfg; // delete mfg;
} }
} }
} }
@ -404,8 +405,8 @@ void runBpSolver (
Solver* solver = 0; Solver* solver = 0;
FactorGraph* mfg = fg; FactorGraph* mfg = fg;
if (fg->isFromBayesNetwork()) { if (fg->isFromBayesNetwork()) {
mfg = BayesBall::getMinimalFactorGraph ( //mfg = BayesBall::getMinimalFactorGraph (
*fg, VarIds (vids.begin(),vids.end())); // *fg, VarIds (vids.begin(),vids.end()));
} }
if (Globals::infAlgorithm == InfAlgorithms::BP) { if (Globals::infAlgorithm == InfAlgorithms::BP) {
solver = new BpSolver (*fg); // FIXME solver = new BpSolver (*fg); // FIXME
@ -418,13 +419,14 @@ void runBpSolver (
} }
if (Globals::verbosity > 0) { if (Globals::verbosity > 0) {
solver->printSolverFlags(); solver->printSolverFlags();
cout << endl;
} }
results.reserve (tasks.size()); results.reserve (tasks.size());
for (unsigned i = 0; i < tasks.size(); i++) { for (unsigned i = 0; i < tasks.size(); i++) {
results.push_back (solver->solveQuery (tasks[i])); results.push_back (solver->solveQuery (tasks[i]));
} }
if (fg->isFromBayesNetwork()) { if (fg->isFromBayesNetwork()) {
delete mfg; //delete mfg;
} }
delete solver; delete solver;
} }