diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2019-12-17 13:43:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 13:43:44 -0800 |
| commit | e9499c41f405df8b42fd9ae10004b1b91a869106 (patch) | |
| tree | fa1475f43a3e61b8f6ffdcb903b65919eba28661 /src/theory/quantifiers/fmf | |
| parent | 9b2914ed9f7b14ecf535ffe9e1328d0fa042e072 (diff) | |
Generate code for options with modes. (#3561)
This commit adds support for code generation of options with modes (enums). From now on option enums can be specified in the corresponding *.toml files without the need of extra code. All option enums are now in the options namespace.
Diffstat (limited to 'src/theory/quantifiers/fmf')
| -rw-r--r-- | src/theory/quantifiers/fmf/full_model_check.cpp | 7 | ||||
| -rw-r--r-- | src/theory/quantifiers/fmf/model_builder.cpp | 2 | ||||
| -rw-r--r-- | src/theory/quantifiers/fmf/model_engine.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/theory/quantifiers/fmf/full_model_check.cpp b/src/theory/quantifiers/fmf/full_model_check.cpp index d6c939e5d..206c8f9dd 100644 --- a/src/theory/quantifiers/fmf/full_model_check.cpp +++ b/src/theory/quantifiers/fmf/full_model_check.cpp @@ -603,12 +603,15 @@ int FullModelChecker::doExhaustiveInstantiation( FirstOrderModel * fm, Node f, i d_quant_cond[f] = op; } - if( options::mbqiMode()==MBQI_NONE ){ + if (options::mbqiMode() == options::MbqiMode::NONE) + { //just exhaustive instantiate Node c = mkCondDefault( fmfmc, f ); d_quant_models[f].addEntry( fmfmc, c, d_false ); return exhaustiveInstantiate( fmfmc, f, c, -1); - }else{ + } + else + { //model check the quantifier doCheck(fmfmc, f, d_quant_models[f], f[1]); Trace("fmc") << "Definition for quantifier " << f << " is : " << std::endl; diff --git a/src/theory/quantifiers/fmf/model_builder.cpp b/src/theory/quantifiers/fmf/model_builder.cpp index caca25fde..a6e1a369c 100644 --- a/src/theory/quantifiers/fmf/model_builder.cpp +++ b/src/theory/quantifiers/fmf/model_builder.cpp @@ -37,7 +37,7 @@ QModelBuilder::QModelBuilder(context::Context* c, QuantifiersEngine* qe) d_triedLemmas(0) {} bool QModelBuilder::optUseModel() { - return options::mbqiMode()!=MBQI_NONE || options::fmfBound(); + return options::mbqiMode() != options::MbqiMode::NONE || options::fmfBound(); } bool QModelBuilder::preProcessBuildModel(TheoryModel* m) { diff --git a/src/theory/quantifiers/fmf/model_engine.cpp b/src/theory/quantifiers/fmf/model_engine.cpp index cdaaa239a..5b2931e42 100644 --- a/src/theory/quantifiers/fmf/model_engine.cpp +++ b/src/theory/quantifiers/fmf/model_engine.cpp @@ -219,9 +219,9 @@ int ModelEngine::checkModel(){ Trace("model-engine-debug") << "Do exhaustive instantiation..." << std::endl; // FMC uses two sub-effort levels - int e_max = options::mbqiMode() == MBQI_FMC + int e_max = options::mbqiMode() == options::MbqiMode::FMC ? 2 - : (options::mbqiMode() == MBQI_TRUST ? 0 : 1); + : (options::mbqiMode() == options::MbqiMode::TRUST ? 0 : 1); for( int e=0; e<e_max; e++) { d_incomplete_quants.clear(); for( unsigned i=0; i<fm->getNumAssertedQuantifiers(); i++ ){ |