diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2021-03-23 15:41:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 20:41:13 +0000 |
| commit | d5d526730d11d08c65aa17ea53d0dffb0a72e692 (patch) | |
| tree | 13ce2001785e168ea82cbd0bce0c1750f987a338 /src/theory/quantifiers_engine.cpp | |
| parent | 8fc8793f4337663f7250846dd6acae167a7f27ec (diff) | |
Passing term registry to ematching utilities (#6190)
Model is now nested into term registry.
This PR also resolves some complications due to namespaces within quantifiers.
Diffstat (limited to 'src/theory/quantifiers_engine.cpp')
| -rw-r--r-- | src/theory/quantifiers_engine.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/theory/quantifiers_engine.cpp b/src/theory/quantifiers_engine.cpp index 9ca8226bc..2cface166 100644 --- a/src/theory/quantifiers_engine.cpp +++ b/src/theory/quantifiers_engine.cpp @@ -51,7 +51,6 @@ QuantifiersEngine::QuantifiersEngine( quantifiers::QuantifiersRegistry& qr, quantifiers::TermRegistry& tr, quantifiers::QuantifiersInferenceManager& qim, - quantifiers::FirstOrderModel* qm, ProofNodeManager* pnm) : d_qstate(qstate), d_qim(qim), @@ -60,8 +59,8 @@ QuantifiersEngine::QuantifiersEngine( d_pnm(pnm), d_qreg(qr), d_treg(tr), - d_tr_trie(new inst::TriggerTrie), - d_model(qm), + d_tr_trie(new quantifiers::inst::TriggerTrie), + d_model(d_treg.getModel()), d_quants_prereg(qstate.getUserContext()), d_quants_red(qstate.getUserContext()) { @@ -81,7 +80,7 @@ void QuantifiersEngine::finishInit(TheoryEngine* te, DecisionManager* dm) d_decManager = dm; // Initialize the modules and the utilities here. d_qmodules.reset(new quantifiers::QuantifiersModules); - d_qmodules->initialize(this, d_qstate, d_qim, d_qreg, dm, d_modules); + d_qmodules->initialize(this, d_qstate, d_qim, d_qreg, d_treg, dm, d_modules); if (d_qmodules->d_rel_dom.get()) { d_util.push_back(d_qmodules->d_rel_dom.get()); @@ -145,7 +144,7 @@ quantifiers::Skolemize* QuantifiersEngine::getSkolemize() const { return d_qim.getSkolemize(); } -inst::TriggerTrie* QuantifiersEngine::getTriggerDatabase() const +quantifiers::inst::TriggerTrie* QuantifiersEngine::getTriggerDatabase() const { return d_tr_trie.get(); } |