diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-08-17 14:38:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-17 12:38:16 -0700 |
commit | 4f82b6eb7cc921ba2c6470a5ca0027be8dfc04e9 (patch) | |
tree | 4060becc52568fce247e9bd4e1660dfed33700dc /src/theory/theory.cpp | |
parent | 5c78f336b8276a2ed8916e2a9447a29a2caca069 (diff) |
Dynamic allocation of equality engine in Theory (#4890)
This commit updates Theory so that equality engines are allocated dynamically. The plan is to make this configurable based on the theory combination method.
The fundamental changes include:
- Add `d_equalityEngine` (raw) pointer to Theory, which is the "official" equality engine of the theory.
- Standardize methods for initializing Theory. This is now made more explicit in the documentation in theory.h, and includes a method `finishInitStandalone` for users of Theory that don't have an associated TheoryEngine.
- Refactor TheoryEngine::finishInit, including how Theory is initialized to incorporate the new policy.
- Things related to master equality engine are now specific to EqEngineManagerDistributed and hence can be removed from TheoryEngine. This will be further refactored in forthcoming PRs.
Note that the majority of changes are due to changing `d_equalityEngine.` to `d_equalityEngine->` throughout.
Diffstat (limited to 'src/theory/theory.cpp')
-rw-r--r-- | src/theory/theory.cpp | 55 |
1 files changed, 43 insertions, 12 deletions
diff --git a/src/theory/theory.cpp b/src/theory/theory.cpp index f1bfd052d..4f0cbdb6a 100644 --- a/src/theory/theory.cpp +++ b/src/theory/theory.cpp @@ -63,7 +63,6 @@ Theory::Theory(TheoryId id, ProofNodeManager* pnm, std::string name) : d_id(id), - d_instanceName(name), d_satContext(satContext), d_userContext(userContext), d_logicInfo(logicInfo), @@ -74,12 +73,15 @@ Theory::Theory(TheoryId id, d_careGraph(NULL), d_quantEngine(NULL), d_decManager(nullptr), + d_instanceName(name), d_checkTime(getStatsPrefix(id) + name + "::checkTime"), d_computeCareGraphTime(getStatsPrefix(id) + name + "::computeCareGraphTime"), d_sharedTerms(satContext), d_out(&out), d_valuation(valuation), + d_equalityEngine(nullptr), + d_allocEqualityEngine(nullptr), d_proofsEnabled(false) { smtStatisticsRegistry()->registerStat(&d_checkTime); @@ -91,7 +93,43 @@ Theory::~Theory() { smtStatisticsRegistry()->unregisterStat(&d_computeCareGraphTime); } -bool Theory::needsEqualityEngine(EeSetupInfo& esi) { return false; } +bool Theory::needsEqualityEngine(EeSetupInfo& esi) +{ + // by default, this theory does not use an (official) equality engine + return false; +} + +void Theory::setEqualityEngine(eq::EqualityEngine* ee) +{ + // set the equality engine pointer + d_equalityEngine = ee; +} +void Theory::setQuantifiersEngine(QuantifiersEngine* qe) +{ + Assert(d_quantEngine == nullptr); + d_quantEngine = qe; +} + +void Theory::setDecisionManager(DecisionManager* dm) +{ + Assert(d_decManager == nullptr); + Assert(dm != nullptr); + d_decManager = dm; +} + +void Theory::finishInitStandalone() +{ + EeSetupInfo esi; + if (needsEqualityEngine(esi)) + { + // always associated with the same SAT context as the theory (d_satContext) + d_allocEqualityEngine.reset(new eq::EqualityEngine( + *esi.d_notify, d_satContext, esi.d_name, esi.d_constantsAreTriggers)); + // use it as the official equality engine + d_equalityEngine = d_allocEqualityEngine.get(); + } + finishInit(); +} TheoryId Theory::theoryOf(options::TheoryOfMode mode, TNode node) { @@ -410,17 +448,10 @@ void Theory::getCareGraph(CareGraph* careGraph) { d_careGraph = NULL; } -void Theory::setQuantifiersEngine(QuantifiersEngine* qe) { - Assert(d_quantEngine == NULL); - Assert(qe != NULL); - d_quantEngine = qe; -} - -void Theory::setDecisionManager(DecisionManager* dm) +eq::EqualityEngine* Theory::getEqualityEngine() { - Assert(d_decManager == nullptr); - Assert(dm != nullptr); - d_decManager = dm; + // get the assigned equality engine, which is a pointer stored in this class + return d_equalityEngine; } }/* CVC4::theory namespace */ |