From 2fa06da3c9232b662e41375effe802956acbc31e Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Mon, 30 Apr 2012 11:20:02 +0100 Subject: [PATCH] disable bayes ball for now --- packages/CLPBN/clpbn/bp/HorusYap.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/CLPBN/clpbn/bp/HorusYap.cpp b/packages/CLPBN/clpbn/bp/HorusYap.cpp index 763dfaab9..876d0c063 100644 --- a/packages/CLPBN/clpbn/bp/HorusYap.cpp +++ b/packages/CLPBN/clpbn/bp/HorusYap.cpp @@ -376,16 +376,17 @@ void runVeSolver ( for (unsigned i = 0; i < tasks.size(); i++) { FactorGraph* mfg = fg; if (fg->isFromBayesNetwork()) { - mfg = BayesBall::getMinimalFactorGraph (*fg, tasks[i]); + // mfg = BayesBall::getMinimalFactorGraph (*fg, tasks[i]); } // VarElimSolver solver (*mfg); VarElimSolver solver (*fg); //FIXME if (Globals::verbosity > 0 && i == 0) { solver.printSolverFlags(); + cout << endl; } results.push_back (solver.solveQuery (tasks[i])); if (fg->isFromBayesNetwork()) { - delete mfg; + // delete mfg; } } } @@ -404,8 +405,8 @@ void runBpSolver ( Solver* solver = 0; FactorGraph* mfg = fg; if (fg->isFromBayesNetwork()) { - mfg = BayesBall::getMinimalFactorGraph ( - *fg, VarIds (vids.begin(),vids.end())); + //mfg = BayesBall::getMinimalFactorGraph ( + // *fg, VarIds (vids.begin(),vids.end())); } if (Globals::infAlgorithm == InfAlgorithms::BP) { solver = new BpSolver (*fg); // FIXME @@ -418,13 +419,14 @@ void runBpSolver ( } if (Globals::verbosity > 0) { solver->printSolverFlags(); + cout << endl; } results.reserve (tasks.size()); for (unsigned i = 0; i < tasks.size(); i++) { results.push_back (solver->solveQuery (tasks[i])); } if (fg->isFromBayesNetwork()) { - delete mfg; + //delete mfg; } delete solver; }