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/CountingBp.cpp
+++ b/packages/CLPBN/horus/CountingBp.cpp
@@ -6,7 +6,7 @@ bool CountingBp::checkForIdenticalFactors = true;


 CountingBp::CountingBp (const FactorGraph& fg)
-    : Solver (fg), freeColor_(0)
+    : GroundSolver (fg), freeColor_(0)
 {
  findIdenticalFactors();
  setInitialColors();
@@ -74,8 +74,8 @@ CountingBp::solveQuery (VarIds queryVids)
      cout << endl;
    }
    if (idx == facNodes.size()) {
-      res = Solver::getJointByConditioning (
-          GroundSolver::CBP, fg, queryVids);
+      res = GroundSolver::getJointByConditioning (
+          GroundSolverType::CBP, fg, queryVids);
    } else {
      VarIds reprArgs;
      for (size_t i = 0; i < queryVids.size(); i++) {