diff options
author | Liana Hadarean <lianahady@gmail.com> | 2012-12-10 20:48:51 -0500 |
---|---|---|
committer | Liana Hadarean <lianahady@gmail.com> | 2012-12-10 20:48:51 -0500 |
commit | 67af0bb961e42ab84c5f82245809ea12e2c12758 (patch) | |
tree | e2ac08edd8f3db204a712b87cf9532eb43f6b709 /src/theory/bv/theory_bv.h | |
parent | a8a471141d2fca4428b7c016ea4494d9925fc544 (diff) |
ported my bv-core branch from svn to git
Diffstat (limited to 'src/theory/bv/theory_bv.h')
-rw-r--r-- | src/theory/bv/theory_bv.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/theory/bv/theory_bv.h b/src/theory/bv/theory_bv.h index e38f3568c..c16e854cc 100644 --- a/src/theory/bv/theory_bv.h +++ b/src/theory/bv/theory_bv.h @@ -28,7 +28,9 @@ #include "context/cdqueue.h" #include "theory/bv/bv_subtheory.h" #include "theory/bv/bv_subtheory_eq.h" +#include "theory/bv/bv_subtheory_core.h" #include "theory/bv/bv_subtheory_bitblast.h" +#include "theory/bv/slicer.h" namespace CVC4 { namespace theory { @@ -43,8 +45,11 @@ class TheoryBV : public Theory { context::CDHashSet<Node, NodeHashFunction> d_alreadyPropagatedSet; context::CDHashSet<Node, NodeHashFunction> d_sharedTermsSet; + Slicer d_slicer; + BitblastSolver d_bitblastSolver; - EqualitySolver d_equalitySolver; + CoreSolver d_coreSolver; + public: TheoryBV(context::Context* c, context::UserContext* u, OutputChannel& out, Valuation valuation, const LogicInfo& logicInfo, QuantifiersEngine* qe); @@ -67,6 +72,7 @@ public: PPAssertStatus ppAssert(TNode in, SubstitutionMap& outSubstitutions); Node ppRewrite(TNode t); + void presolve(); private: class Statistics { @@ -137,6 +143,7 @@ private: friend class Bitblaster; friend class BitblastSolver; friend class EqualitySolver; + friend class CoreSolver; };/* class TheoryBV */ |