mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 00:55:31 +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

2
src/qe/qe.cpp
View file

@ -2049,7 +2049,7 @@ namespace qe {
}
void checkpoint() {
if (m.canceled())
if (!m.inc())
throw tactic_exception(m.limit().get_cancel_msg());
}

4
src/qe/qe_arith.cpp
View file

@ -65,9 +65,9 @@ namespace qe {
DEBUG_CODE(expr_ref val(m);
eval(lit, val);
CTRACE("qe", !m.is_true(val), tout << mk_pp(lit, m) << " := " << val << "\n";);
SASSERT(m.canceled() || m.is_true(val)););
SASSERT(m.limit().get_cancel_flag() || m.is_true(val)););
if (!m.limit().inc())
if (!m.inc())
return false;
TRACE("opt", tout << mk_pp(lit, m) << " " << a.is_lt(lit) << " " << a.is_gt(lit) << "\n";);

12
src/qe/qe_lite.cpp
View file

@ -682,8 +682,7 @@ namespace qel {
}
void checkpoint() {
if (m.canceled())
throw tactic_exception(m.limit().get_cancel_msg());
tactic::checkpoint(m);
}
public:
@ -870,8 +869,7 @@ namespace qel {
}
void checkpoint() {
if (m.canceled())
throw tactic_exception(m.limit().get_cancel_msg());
tactic::checkpoint(m);
}
public:
@ -2144,8 +2142,7 @@ namespace fm {
}
void checkpoint() {
if (m.canceled())
throw tactic_exception(m.limit().get_cancel_msg());
tactic::checkpoint(m);
}
public:
@ -2411,8 +2408,7 @@ class qe_lite_tactic : public tactic {
qe_lite m_qe;
void checkpoint() {
if (m.canceled())
throw tactic_exception(m.limit().get_cancel_msg());
tactic::checkpoint(m);
}
#if 0

4
src/qe/qe_mbp.cpp
View file

@ -207,10 +207,10 @@ class mbp::impl {
continue;
}
m_visited.mark(e);
if (m.is_bool(e) && !m.is_true(e) && !m.is_false(e) && !m.canceled()) {
if (m.is_bool(e) && !m.is_true(e) && !m.is_false(e) && m.inc()) {
expr_ref val = eval(e);
TRACE("qe", tout << "found: " << mk_pp(e, m) << "\n";);
if (m.canceled())
if (!m.inc())
continue;
SASSERT(m.is_true(val) || m.is_false(val));
if (!m_bool_visited.is_marked(e)) {

3
src/qe/qe_tactic.cpp
View file

@ -43,8 +43,7 @@ class qe_tactic : public tactic {
}
void checkpoint() {
if (m.canceled())
throw tactic_exception(m.limit().get_cancel_msg());
tactic::checkpoint(m);
}
void operator()(goal_ref const & g,

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) {