From 7aa55e0d38e73a02b11ad0c5a60196b610674050 Mon Sep 17 00:00:00 2001 From: Liana Hadarean Date: Sat, 25 Feb 2012 18:23:10 +0000 Subject: Refactored CnfStream to work with the bv theory Bitblaster: * separated SatSolverInput interface class into two classes: - TheoryProxy for the sat solver to communicate with the theories - SatSolverInterface abstract class to communicate with the sat solver * instead of using #ifdef typedef for SatClauses and SatLiterals, now there are CVC4 SatLiteral/SatClause types and mappings between them and the internal sat solver clause/literal representation * added abstract classes for DPLLSatSolver and BVSatSolver different interfaces Replaced TheoryBV with bitblasting implementation: * all operators bitblasted * only operator elimination rewrite rules so far --- src/prop/minisat/simp/SimpSolver.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/prop/minisat/simp/SimpSolver.h') diff --git a/src/prop/minisat/simp/SimpSolver.h b/src/prop/minisat/simp/SimpSolver.h index 68ea6e463..97f5c2265 100644 --- a/src/prop/minisat/simp/SimpSolver.h +++ b/src/prop/minisat/simp/SimpSolver.h @@ -23,13 +23,13 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include "cvc4_private.h" -#include "mtl/Queue.h" -#include "core/Solver.h" +#include "prop/minisat/mtl/Queue.h" +#include "prop/minisat/core/Solver.h" namespace CVC4 { namespace prop { - class SatSolver; + class TheoryProxy; } } @@ -41,7 +41,7 @@ class SimpSolver : public Solver { public: // Constructor/Destructor: // - SimpSolver(CVC4::prop::SatSolver* proxy, CVC4::context::Context* context, bool enableIncremental = false); + SimpSolver(CVC4::prop::TheoryProxy* proxy, CVC4::context::Context* context, bool enableIncremental = false); CVC4_PUBLIC ~SimpSolver(); // Problem specification: -- cgit v1.2.3