diff options
author | lianah <lianahady@gmail.com> | 2013-03-25 18:24:29 -0400 |
---|---|---|
committer | lianah <lianahady@gmail.com> | 2013-03-25 18:24:29 -0400 |
commit | 7f9b419adf3e45ce12ab9fb9b2d1afa076110e7d (patch) | |
tree | 025ca60adcbd33c2a2053fdc539217d398c438a5 /src/theory/bv/theory_bv.cpp | |
parent | 147f93cc140b1cf2a5957cbe95eccfc92e4d90b0 (diff) |
getEqualityStatus now also queries the inequality solver
Diffstat (limited to 'src/theory/bv/theory_bv.cpp')
-rw-r--r-- | src/theory/bv/theory_bv.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/theory/bv/theory_bv.cpp b/src/theory/bv/theory_bv.cpp index bc8e39e67..bdf93eadc 100644 --- a/src/theory/bv/theory_bv.cpp +++ b/src/theory/bv/theory_bv.cpp @@ -32,9 +32,6 @@ using namespace CVC4::context; using namespace std; using namespace CVC4::theory::bv::utils; - - - TheoryBV::TheoryBV(context::Context* c, context::UserContext* u, OutputChannel& out, Valuation valuation, const LogicInfo& logicInfo, QuantifiersEngine* qe) : Theory(THEORY_BV, c, u, out, valuation, logicInfo, qe), d_context(c), @@ -122,11 +119,11 @@ void TheoryBV::check(Effort e) } Assert (!ok == inConflict()); - if (!inConflict() && !d_coreSolver.isCoreTheory()) { + if (!inConflict() && !d_coreSolver.isComplete()) { ok = d_inequalitySolver.check(e); } - Assert (!ok == inConflict()); + // Assert (!ok == inConflict()); // if (!inConflict() && !d_coreSolver.isCoreTheory()) { // if (!inConflict() && !d_inequalitySolver.isInequalityTheory()) { // ok = d_bitblastSolver.check(e); @@ -304,6 +301,9 @@ EqualityStatus TheoryBV::getEqualityStatus(TNode a, TNode b) EqualityStatus status = d_coreSolver.getEqualityStatus(a, b); if (status == EQUALITY_UNKNOWN) { + status = d_inequalitySolver.getEqualityStatus(a, b); + } + if (status == EQUALITY_UNKNOWN) { status = d_bitblastSolver.getEqualityStatus(a, b); } |