add an enum for lifted solvers and do some renamings

2012-05-30 17:17:39 +01:00
parent ac38e9e6a6
commit 8d14593c3e
4 changed files with 27 additions and 16 deletions
--- a/packages/CLPBN/horus/HorusCli.cpp
+++ b/packages/CLPBN/horus/HorusCli.cpp
@@ -161,14 +161,14 @@ void
 runSolver (const FactorGraph& fg, const VarIds& queryIds)
 {
  Solver* solver = 0;
-  switch (Globals::infAlgorithm) {
-    case InfAlgorithms::VE:
+  switch (Globals::groundSolver) {
+    case GroundSolvers::VE:
      solver = new VarElimSolver (fg);
      break;
-    case InfAlgorithms::BP:
+    case GroundSolvers::BP:
      solver = new BpSolver (fg);
      break;
-    case InfAlgorithms::CBP:
+    case GroundSolvers::CBP:
      solver = new CbpSolver (fg);
      break;
    default: