mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-18 03:46:17 +00:00
Code Activity

handle cancelation from nra_solver gracefully

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-07-10 17:34:45 -07:00
parent 0170a9772a
commit 5e5f46f0f8
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/smt_context_pp.cpp
View file

@ -419,6 +419,7 @@ namespace smt {
visitor.collect(fmls); visitor.collect(fmls);
visitor.display_decls(out); visitor.display_decls(out);
visitor.display_asserts(out, fmls, true); visitor.display_asserts(out, fmls, true);
out << "(check-sat)\n";
} }
static unsigned g_lemma_id = 0; static unsigned g_lemma_id = 0;
@ -464,6 +465,7 @@ namespace smt {
visitor.collect(fmls); visitor.collect(fmls);
visitor.display_decls(out); visitor.display_decls(out);
visitor.display_asserts(out, fmls, true); visitor.display_asserts(out, fmls, true);
out << "(check-sat)\n";
} }
void context::display_lemma_as_smt_problem(unsigned num_antecedents, literal const * antecedents, void context::display_lemma_as_smt_problem(unsigned num_antecedents, literal const * antecedents,

13
src/util/lp/nra_solver.cpp
View file

@ -104,7 +104,18 @@ namespace nra {
} }
// TBD: add variable bounds? // TBD: add variable bounds?
lbool r = m_nlsat->check(); lbool r = l_undef;
try {
r = m_nlsat->check();
}
catch (z3_exception&) {
if (m_limit.get_cancel_flag()) {
r = l_undef;
}
else {
throw;
}
}
TRACE("arith", display(tout); m_nlsat->display(tout << r << "\n");); TRACE("arith", display(tout); m_nlsat->display(tout << r << "\n"););
switch (r) { switch (r) {
case l_true: case l_true: