diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-11-10 16:41:01 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-11-10 16:41:01 +0000 |
| commit | 3169a068f1a0a6b1f8cc902847d106664d6c0bd9 (patch) | |
| tree | 3d0ffedb4dff63cab04e5b3c867eaa4b9aec5dc7 /src | |
| parent | e1068a39e661d89d20b47e15fa7d142a28733196 (diff) | |
Updates to Clark's commit r4540:
* ALL_SUPPORTED/QF_ALL_SUPPORTED don't include nonlinear
* Change "Notice" to "Warning" when produce-models turned off due to non-linear
(this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/smt/smt_engine.cpp | 4 | ||||
| -rw-r--r-- | src/theory/logic_info.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp index 761fe3b8c..e308db269 100644 --- a/src/smt/smt_engine.cpp +++ b/src/smt/smt_engine.cpp @@ -892,11 +892,11 @@ void SmtEngine::setLogicInternal() throw() { if (d_logic.isTheoryEnabled(theory::THEORY_ARITH) && !d_logic.isLinear()) { if (options::produceModels()) { - Notice() << "SmtEngine: turning off produce-models because unsupported for nonlinear arith" << std::endl; + Warning() << "SmtEngine: turning off produce-models because unsupported for nonlinear arith" << std::endl; setOption("produce-models", SExpr("false")); } if (options::checkModels()) { - Notice() << "SmtEngine: turning off check-models because unsupported for nonlinear arith" << std::endl; + Warning() << "SmtEngine: turning off check-models because unsupported for nonlinear arith" << std::endl; setOption("check-models", SExpr("false")); } } diff --git a/src/theory/logic_info.cpp b/src/theory/logic_info.cpp index d721d089e..d2cf57643 100644 --- a/src/theory/logic_info.cpp +++ b/src/theory/logic_info.cpp @@ -35,7 +35,7 @@ LogicInfo::LogicInfo() : d_sharingTheories(0), d_integers(true), d_reals(true), - d_linear(false), + d_linear(true),// for now, "everything enabled" doesn't include non-linear arith d_differenceLogic(false), d_locked(false) { |