diff options
author | ajreynol <andrew.j.reynolds@gmail.com> | 2015-06-27 09:30:06 +0200 |
---|---|---|
committer | ajreynol <andrew.j.reynolds@gmail.com> | 2015-06-27 09:30:06 +0200 |
commit | 65c2e1688d83dfeb913b689c10d9b43c5dc89cc0 (patch) | |
tree | f552414624cd7259e638b6edc0c7a710a4215138 /src/theory/quantifiers/model_builder.cpp | |
parent | e4cff69e3b565e928dbf04960249477ce2c9ef6b (diff) |
Refactor various corner cases of fmf, quantifiers modules. Enable cbqi2 by default on pure quantified arithmetic. Fix bug in sort inference related to mixed real/int, add regression.
Diffstat (limited to 'src/theory/quantifiers/model_builder.cpp')
-rw-r--r-- | src/theory/quantifiers/model_builder.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/theory/quantifiers/model_builder.cpp b/src/theory/quantifiers/model_builder.cpp index 53f55e70b..e297e138c 100644 --- a/src/theory/quantifiers/model_builder.cpp +++ b/src/theory/quantifiers/model_builder.cpp @@ -176,7 +176,7 @@ void QModelBuilderIG::processBuildModel( TheoryModel* m, bool fullModel ) { } //if applicable, find exceptions to model via inst-gen - if( optInstGen() ){ + if( options::fmfInstGen() ){ d_didInstGen = true; d_instGenMatches = 0; d_numQuantSat = 0; @@ -201,7 +201,7 @@ void QModelBuilderIG::processBuildModel( TheoryModel* m, bool fullModel ) { }else{ d_numQuantNoSelForm++; } - if( optOneQuantPerRoundInstGen() && lems>0 ){ + if( options::fmfInstGenOneQuantPerRound() && lems>0 ){ break; } }else if( d_quant_sat.find( f )!=d_quant_sat.end() ){ @@ -341,14 +341,6 @@ bool QModelBuilderIG::hasConstantDefinition( Node n ){ return false; } -bool QModelBuilderIG::optInstGen(){ - return options::fmfInstGen(); -} - -bool QModelBuilderIG::optOneQuantPerRoundInstGen(){ - return options::fmfInstGenOneQuantPerRound(); -} - QModelBuilderIG::Statistics::Statistics(): d_num_quants_init("QModelBuilderIG::Number_Quantifiers", 0), d_num_partial_quants_init("QModelBuilderIG::Number_Partial_Quantifiers", 0), |