diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2017-11-24 19:08:41 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-24 19:08:41 -0600 |
| commit | 3ab0db55341e7e752411bb003fb203fcd9ec9120 (patch) | |
| tree | df79841a5e8244ea159ccc4a5e32c9e9d5fee2dc /src/theory/quantifiers/model_engine.cpp | |
| parent | bb095659fb12e3733a73f1be31769ff5b5eb6055 (diff) | |
(Refactor) Instantiate utility (#1387)
Diffstat (limited to 'src/theory/quantifiers/model_engine.cpp')
| -rw-r--r-- | src/theory/quantifiers/model_engine.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/theory/quantifiers/model_engine.cpp b/src/theory/quantifiers/model_engine.cpp index 5d01e04e6..fe6e3945b 100644 --- a/src/theory/quantifiers/model_engine.cpp +++ b/src/theory/quantifiers/model_engine.cpp @@ -18,6 +18,7 @@ #include "theory/quantifiers/ambqi_builder.h" #include "theory/quantifiers/first_order_model.h" #include "theory/quantifiers/full_model_check.h" +#include "theory/quantifiers/instantiate.h" #include "theory/quantifiers/quantifiers_attributes.h" #include "theory/quantifiers/term_database.h" #include "theory/quantifiers/term_util.h" @@ -285,17 +286,20 @@ void ModelEngine::exhaustiveInstantiate( Node f, int effort ){ if( !riter.isIncomplete() ){ int triedLemmas = 0; int addedLemmas = 0; + EqualityQuery* qy = d_quantEngine->getEqualityQuery(); + Instantiate* inst = d_quantEngine->getInstantiate(); while( !riter.isFinished() && ( addedLemmas==0 || !options::fmfOneInstPerRound() ) ){ //instantiation was not shown to be true, construct the match InstMatch m( f ); for (unsigned i = 0; i < riter.getNumTerms(); i++) { - m.set( d_quantEngine, i, riter.getCurrentTerm( i ) ); + m.set(qy, i, riter.getCurrentTerm(i)); } Debug("fmf-model-eval") << "* Add instantiation " << m << std::endl; triedLemmas++; //add as instantiation - if( d_quantEngine->addInstantiation( f, m, true ) ){ + if (inst->addInstantiation(f, m, true)) + { addedLemmas++; if( d_quantEngine->inConflict() ){ break; |