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

add an enum for lifted solvers and do some renamings

Browse Source
This commit is contained in:
Tiago Gomes
2012-05-30 17:17:39 +01:00
parent ac38e9e6a6
commit 8d14593c3e
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CLPBN/horus/HorusYap.cpp
View File

@@ -352,7 +352,7 @@ runGroundSolver (void)
}
vector<Params> results;
if (Globals::infAlgorithm == InfAlgorithms::VE) {
if (Globals::groundSolver == GroundSolvers::VE) {
runVeSolver (fg, tasks, results);
} else {
runBpSolver (fg, tasks, results);
@@ -417,9 +417,9 @@ void runBpSolver (
//mfg = BayesBall::getMinimalFactorGraph (
// *fg, VarIds (vids.begin(),vids.end()));
}
if (Globals::infAlgorithm == InfAlgorithms::BP) {
if (Globals::groundSolver == GroundSolvers::BP) {
solver = new BpSolver (*fg); // FIXME
} else if (Globals::infAlgorithm == InfAlgorithms::CBP) {
} else if (Globals::groundSolver == GroundSolvers::CBP) {
CFactorGraph::checkForIdenticalFactors = false;
solver = new CbpSolver (*fg); // FIXME
} else {