diff options
author | Liana Hadarean <lianahady@gmail.com> | 2013-03-19 21:54:22 -0400 |
---|---|---|
committer | Liana Hadarean <lianahady@gmail.com> | 2013-03-19 21:54:22 -0400 |
commit | 4cd63abf2ab901ad8d1b1c2cc2e84707736b5659 (patch) | |
tree | b45789d51329bbfdf0043f9fcb577ea0fb2c38bc /src/theory/bv/theory_bv.h | |
parent | d58d78b3ac3e5abfaa4e01d87bb351c0268239df (diff) |
inequality reasoning works on small examples added to regressions (not incremental); currently disabled though
Diffstat (limited to 'src/theory/bv/theory_bv.h')
-rw-r--r-- | src/theory/bv/theory_bv.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/theory/bv/theory_bv.h b/src/theory/bv/theory_bv.h index 85077f10d..13a475d3d 100644 --- a/src/theory/bv/theory_bv.h +++ b/src/theory/bv/theory_bv.h @@ -28,6 +28,7 @@ #include "theory/bv/bv_subtheory.h" #include "theory/bv/bv_subtheory_core.h" #include "theory/bv/bv_subtheory_bitblast.h" +#include "theory/bv/bv_subtheory_inequality.h" #include "theory/bv/slicer.h" namespace CVC4 { @@ -42,11 +43,10 @@ class TheoryBV : public Theory { /** Context dependent set of atoms we already propagated */ context::CDHashSet<Node, NodeHashFunction> d_alreadyPropagatedSet; context::CDHashSet<Node, NodeHashFunction> d_sharedTermsSet; - - BitblastSolver d_bitblastSolver; - // TODO generalize to multiple subtheories - CoreSolver d_coreSolver; + CoreSolver d_coreSolver; + InequalitySolver d_inequalitySolver; + BitblastSolver d_bitblastSolver; public: TheoryBV(context::Context* c, context::UserContext* u, OutputChannel& out, Valuation valuation, const LogicInfo& logicInfo, QuantifiersEngine* qe); @@ -141,7 +141,7 @@ private: friend class BitblastSolver; friend class EqualitySolver; friend class CoreSolver; - + friend class InequalitySolver; };/* class TheoryBV */ }/* CVC4::theory::bv namespace */ |