diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2014-01-03 22:36:55 -0600 |
---|---|---|
committer | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2014-01-03 22:36:55 -0600 |
commit | 2ce92038d8455637e313a1c2d0ce5d31a3d42b10 (patch) | |
tree | ce599c2e981bbd79d024e90cff6e97468b42712b /src/smt | |
parent | 93f084750d8a76d63fc74d242944bce0635c2194 (diff) |
Removing and consolidating options for uf-ss and quantifiers. Bug fix for inst gen-style MBQI.
Diffstat (limited to 'src/smt')
-rw-r--r-- | src/smt/smt_engine.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp index 539622877..014d3c603 100644 --- a/src/smt/smt_engine.cpp +++ b/src/smt/smt_engine.cpp @@ -1142,16 +1142,9 @@ void SmtEngine::setLogicInternal() throw() { options::instWhenMode.set( INST_WHEN_LAST_CALL ); } } - if ( ! options::fmfInstGen.wasSetByUser()) { - //if full model checking is on, disable inst-gen techniques - if( options::mbqiMode()==quantifiers::MBQI_FMC || options::mbqiMode()==quantifiers::MBQI_INTERVAL ){ - options::fmfInstGen.set( false ); - }else{ - options::fmfInstGen.set( true ); - } - } if ( options::fmfBoundInt() ){ - if( options::mbqiMode()!=quantifiers::MBQI_NONE ){ + if( options::mbqiMode()!=quantifiers::MBQI_NONE && + options::mbqiMode()!=quantifiers::MBQI_FMC_INTERVAL ){ //if bounded integers are set, must use full model check for MBQI options::mbqiMode.set( quantifiers::MBQI_FMC ); } |