diff options
author | Tim King <taking@google.com> | 2016-01-05 16:29:44 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2016-01-05 16:29:44 -0800 |
commit | 5eabda0f55cee3be81aa7ae126269c32e818322f (patch) | |
tree | b873e4cb8e5d37ff3bb70596494bc5964aaef135 /src/theory/theory.h | |
parent | b717513e2a1d956c4456d13e0625957fc84c2449 (diff) |
Add SmtGlobals Class
- The options replayStream, lemmaInputChannel, lemmaOutputChannel have been removed due to their datatypes. These datatypes were previously pointers to types that were not usable from the options/ library.
- The option replayLog has been removed due to inconsistent memory management.
- SmtGlobals is a class that wraps a pointer to each of these removed options. These can each be set independently.
- There is a single SmtGlobals per SmtEngine with the lifetime of the SmtEngine.
- A pointer to this is freely given to the user of an SmtEngine to parameterize the solver after construction.
- Selected classes have been given a copy of this pointer in their constructors.
- Removed the dependence on Node from Result. Moving Result back into util/.
Diffstat (limited to 'src/theory/theory.h')
-rw-r--r-- | src/theory/theory.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/theory/theory.h b/src/theory/theory.h index 5f4c80cf2..d17d97f97 100644 --- a/src/theory/theory.h +++ b/src/theory/theory.h @@ -34,6 +34,7 @@ #include "options/theory_options.h" #include "options/theoryof_mode.h" #include "smt/logic_request.h" +#include "smt/smt_globals.h" #include "smt_util/command.h" #include "smt_util/dump.h" #include "theory/logic_info.h" @@ -245,7 +246,8 @@ protected: * Construct a Theory. */ Theory(TheoryId id, context::Context* satContext, context::UserContext* userContext, - OutputChannel& out, Valuation valuation, const LogicInfo& logicInfo) throw() + OutputChannel& out, Valuation valuation, const LogicInfo& logicInfo, + SmtGlobals* globals) throw() : d_id(id) , d_satContext(satContext) , d_userContext(userContext) @@ -261,6 +263,7 @@ protected: , d_out(&out) , d_valuation(valuation) , d_proofEnabled(false) + , d_globals(globals) { StatisticsRegistry::registerStat(&d_checkTime); StatisticsRegistry::registerStat(&d_computeCareGraphTime); @@ -313,6 +316,8 @@ protected: */ bool d_proofEnabled; + SmtGlobals* d_globals; + public: /** @@ -870,6 +875,10 @@ public: */ virtual std::pair<bool, Node> entailmentCheck(TNode lit, const EntailmentCheckParameters* params = NULL, EntailmentCheckSideEffects* out = NULL); + + /** Returns a pointer to the globals copy the theory is using. */ + SmtGlobals* globals() { return d_globals; } + };/* class Theory */ std::ostream& operator<<(std::ostream& os, theory::Theory::Effort level); |