diff options
| author | ajreynol <andrew.j.reynolds@gmail.com> | 2014-10-13 15:53:48 +0200 |
|---|---|---|
| committer | ajreynol <andrew.j.reynolds@gmail.com> | 2014-10-13 15:53:48 +0200 |
| commit | 3da09bb56cf9fb3a74c9baef55209bc943aa435b (patch) | |
| tree | 5053a353ad0cd21b63f09dbdfd142f4bed837878 /src/theory/quantifiers/model_builder.cpp | |
| parent | c3992de261f0fa968f50349de1bdc3f9bef6ce6b (diff) | |
Model building into quantifiers engine. Simplify axiom-inst mode.
Diffstat (limited to 'src/theory/quantifiers/model_builder.cpp')
| -rw-r--r-- | src/theory/quantifiers/model_builder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/theory/quantifiers/model_builder.cpp b/src/theory/quantifiers/model_builder.cpp index cbff2b581..f6392a0b2 100644 --- a/src/theory/quantifiers/model_builder.cpp +++ b/src/theory/quantifiers/model_builder.cpp @@ -36,7 +36,7 @@ using namespace CVC4::theory::quantifiers; QModelBuilder::QModelBuilder( context::Context* c, QuantifiersEngine* qe ) : TheoryEngineModelBuilder( qe->getTheoryEngine() ), d_curr_model( c, NULL ), d_qe( qe ){ - d_considerAxioms = true; + } bool QModelBuilder::isQuantifierActive( Node f ) { @@ -161,7 +161,7 @@ void QModelBuilderIG::processBuildModel( TheoryModel* m, bool fullModel ) { Trace("model-engine") << "Initialize, Added Lemmas = " << d_addedLemmas << std::endl; }else{ //initialize model - fm->initialize( d_considerAxioms ); + fm->initialize(); //analyze the functions Trace("model-engine-debug") << "Analyzing model..." << std::endl; analyzeModel( fm ); @@ -382,7 +382,7 @@ QModelBuilderIG::Statistics::~Statistics(){ } bool QModelBuilderIG::isQuantifierActive( Node f ){ - return d_qe->hasOwnership( f ) && ( d_considerAxioms || !d_qe->getTermDatabase()->isQAttrAxiom( f ) ) && d_quant_sat.find( f )==d_quant_sat.end(); + return d_qe->hasOwnership( f ) && d_quant_sat.find( f )==d_quant_sat.end(); } bool QModelBuilderIG::isTermActive( Node n ){ |