diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2012-07-12 18:30:15 +0000 |
---|---|---|
committer | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2012-07-12 18:30:15 +0000 |
commit | 65798541fa437278cde0c759ab70fd9fa4fe9638 (patch) | |
tree | 27341327b8159e58a5ce6371bede6129bf67beb3 /src/theory/bv/theory_bv.h | |
parent | 78d8b3ce56a1fd243acb54d2aaaf6d716e3b9788 (diff) |
merged fmf-devel branch, includes support for SMT2 command get-value and (extended) SMT command get-model. added collectModelInfo and removed getValue from theory interface. merge also includes major updates to finite model finding module (from CASC), added fmf options, some updates to strong solver and quantifiers engine interface. The test recursion_breaker_black currently fails for me on production builds, Morgan is planning to look into this.
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 761c11e3d..611927b2b 100644 --- a/src/theory/bv/theory_bv.h +++ b/src/theory/bv/theory_bv.h @@ -57,10 +57,10 @@ public: void check(Effort e); void propagate(Effort e); - + Node explain(TNode n); - Node getValue(TNode n); + void collectModelInfo( TheoryModel* m ); std::string identify() const { return std::string("TheoryBV"); } @@ -124,7 +124,7 @@ private: } void setConflict(Node conflict = Node::null()) { - d_conflict = true; + d_conflict = true; d_conflictNode = conflict; } @@ -136,8 +136,8 @@ private: friend class Bitblaster; friend class BitblastSolver; - friend class EqualitySolver; - + friend class EqualitySolver; + };/* class TheoryBV */ }/* CVC4::theory::bv namespace */ |