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/expr/expr_template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/expr') diff --git a/src/expr/expr_template.h b/src/expr/expr_template.h index 56396da01..7a6c0179d 100644 --- a/src/expr/expr_template.h +++ b/src/expr/expr_template.h @@ -65,7 +65,7 @@ namespace expr { }/* CVC4::expr namespace */ namespace prop { - class SatSolver; + class TheoryProxy; }/* CVC4::prop namespace */ class ExprManagerMapCollection; @@ -536,7 +536,7 @@ protected: friend class NodeManager; friend class TypeCheckingException; friend class expr::pickle::Pickler; - friend class prop::SatSolver; + friend class prop::TheoryProxy; friend NodeTemplate expr::exportInternal(NodeTemplate n, ExprManager* from, ExprManager* to, ExprManagerMapCollection& vmap); friend std::ostream& CVC4::operator<<(std::ostream& out, const Expr& e); -- cgit v1.2.3