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/ce_guided_conjecture.cpp | |
| parent | bb095659fb12e3733a73f1be31769ff5b5eb6055 (diff) | |
(Refactor) Instantiate utility (#1387)
Diffstat (limited to 'src/theory/quantifiers/ce_guided_conjecture.cpp')
| -rw-r--r-- | src/theory/quantifiers/ce_guided_conjecture.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/theory/quantifiers/ce_guided_conjecture.cpp b/src/theory/quantifiers/ce_guided_conjecture.cpp index bc6817560..378b26eef 100644 --- a/src/theory/quantifiers/ce_guided_conjecture.cpp +++ b/src/theory/quantifiers/ce_guided_conjecture.cpp @@ -21,6 +21,7 @@ #include "prop/prop_engine.h" #include "smt/smt_statistics_registry.h" #include "theory/quantifiers/first_order_model.h" +#include "theory/quantifiers/instantiate.h" #include "theory/quantifiers/quantifiers_attributes.h" #include "theory/quantifiers/skolemize.h" #include "theory/quantifiers/term_database_sygus.h" @@ -108,7 +109,8 @@ void CegConjecture::assign( Node q ) { } Trace("cegqi") << "Base quantified formula is : " << d_embed_quant << std::endl; //construct base instantiation - d_base_inst = Rewriter::rewrite( d_qe->getInstantiation( d_embed_quant, vars, d_candidates ) ); + d_base_inst = Rewriter::rewrite(d_qe->getInstantiate()->getInstantiation( + d_embed_quant, vars, d_candidates)); Trace("cegqi") << "Base instantiation is : " << d_base_inst << std::endl; // register this term with sygus database and other utilities that impact @@ -224,7 +226,8 @@ void CegConjecture::doBasicCheck(std::vector< Node >& lems) { getCandidateList( clist, true ); Assert( clist.size()==d_quant[0].getNumChildren() ); getModelValues( clist, model_terms ); - if( d_qe->addInstantiation( d_quant, model_terms ) ){ + if (d_qe->getInstantiate()->addInstantiation(d_quant, model_terms)) + { //record the instantiation recordInstantiation( model_terms ); }else{ |