diff options
| author | François Bobot <francois@bobot.eu> | 2012-07-27 13:36:32 +0000 |
|---|---|---|
| committer | François Bobot <francois@bobot.eu> | 2012-07-27 13:36:32 +0000 |
| commit | 4bfa927dac67bbcadf219f70e61f1d123e33944b (patch) | |
| tree | f295343430799748de8b9a823f1a3c641c096905 /src/theory/quantifiers/model_engine.cpp | |
| parent | 988c97d92fa617c5dccaeb1ef33121bfa6459afc (diff) | |
Merge quantifiers2-trunk:
- new syntax for rewrite rules
- better rewrite rules theory
- remove the rewriting with rewrite rules during ppRewrite temporarily
- theory can define their own candidate generator
- define a general candidate generator (inefficient ask to every theory)
- split inst_match between the pattern matching used for quantifiers (inst_match.*) and
the one used for rewrite rules (rr_inst_match.*):
- the pattern matching is less exhaustive for quantifiers,
- the one for rewrite rules can use efficient-e-matching.
Diffstat (limited to 'src/theory/quantifiers/model_engine.cpp')
| -rw-r--r-- | src/theory/quantifiers/model_engine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/theory/quantifiers/model_engine.cpp b/src/theory/quantifiers/model_engine.cpp index ad259f864..663f270eb 100644 --- a/src/theory/quantifiers/model_engine.cpp +++ b/src/theory/quantifiers/model_engine.cpp @@ -39,6 +39,7 @@ using namespace CVC4::kind; using namespace CVC4::context; using namespace CVC4::theory; using namespace CVC4::theory::quantifiers; +using namespace CVC4::theory::inst; ModelEngineBuilder::ModelEngineBuilder( QuantifiersEngine* qe ) : TheoryEngineModelBuilder( qe->getTheoryEngine() ), @@ -503,7 +504,7 @@ int ModelEngine::initializeQuantifier( Node f ){ ics.push_back( ic ); terms.push_back( t ); //calculate the basis match for f - d_builder.d_quant_basis_match[f].d_map[ ic ] = t; + d_builder.d_quant_basis_match[f].set( ic, t); } ++(d_statistics.d_num_quants_init); //register model basis body |