mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-07 15:55:46 +00:00
Code Activity

fix #3557

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-03 16:37:59 -07:00
parent 0b856638e9
commit 426e4cc75c
65 changed files with 135 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/qe/qsat.cpp
View file

@ -856,9 +856,7 @@ namespace qe {
}
void check_cancel() {
if (m.canceled()) {
throw tactic_exception(m.limit().get_cancel_msg());
}
tactic::checkpoint(m);
}
void display(std::ostream& out) const {
@ -1125,7 +1123,7 @@ namespace qe {
expr_ref_vector fmls(m);
fmls.append(core.size(), core.c_ptr());
s.get_assertions(fmls);
return check_fmls(fmls) || m.canceled();
return check_fmls(fmls) || !m.inc();
#endif
}
@ -1138,7 +1136,7 @@ namespace qe {
lbool is_sat = solver.check();
CTRACE("qe", is_sat != l_false,
tout << fmls << "\nare not unsat\n";);
return (is_sat == l_false) || m.canceled();
return (is_sat == l_false) || !m.inc();
}
bool validate_model(expr_ref_vector const& asms) {
@ -1157,7 +1155,7 @@ namespace qe {
bool validate_model(model& mdl, unsigned sz, expr* const* fmls) {
expr_ref val(m);
for (unsigned i = 0; i < sz; ++i) {
if (!m_model->is_true(fmls[i]) && !m.canceled()) {
if (!m_model->is_true(fmls[i]) && m.inc()) {
TRACE("qe", tout << "Formula does not evaluate to true in model: " << mk_pp(fmls[i], m) << "\n";);
return false;
}
@ -1189,7 +1187,7 @@ namespace qe {
TRACE("qe", tout << "Projection is false in model\n";);
return false;
}
if (m.canceled()) {
if (!m.inc()) {
return true;
}
for (unsigned i = 0; i < m_avars.size(); ++i) {