Introduce a lifted solver class

2012-11-14 21:55:51 +00:00
parent 6e7d0d1d0a
commit 64a27847cc
17 changed files with 53 additions and 197 deletions
--- a/packages/CLPBN/horus/HorusCli.cpp
+++ b/packages/CLPBN/horus/HorusCli.cpp
@@ -160,15 +160,15 @@ readQueryAndEvidence (
 void
 runSolver (const FactorGraph& fg, const VarIds& queryIds)
 {
-  Solver* solver = 0;
+  GroundSolver* solver = 0;
  switch (Globals::groundSolver) {
-    case GroundSolver::VE:
+    case GroundSolverType::VE:
      solver = new VarElim (fg);
      break;
-    case GroundSolver::BP:
+    case GroundSolverType::BP:
      solver = new BeliefProp (fg);
      break;
-    case GroundSolver::CBP:
+    case GroundSolverType::CBP:
      solver = new CountingBp (fg);
      break;
    default: