3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 21:38:44 +00:00
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-17 11:07:51 -07:00 committed by Lev Nachmanson
parent 51ffaae396
commit 4c5c17c7d8
3 changed files with 5 additions and 2 deletions

View file

@ -1246,7 +1246,9 @@ bool core::conflict_found() const {
}
bool core::done() const {
return m_lemma_vec->size() >= 10 || conflict_found();
return m_lemma_vec->size() >= 10 ||
conflict_found() ||
lp_settings().get_cancel_flag();
}
lbool core::incremental_linearization(bool constraint_derived) {

View file

@ -134,7 +134,7 @@ struct imp {
SASSERT(plane_is_correct_cut(a));
int steps = 10;
point del = a - m_xy;
while (steps--) {
while (steps-- && !c().done()) {
del *= rational(2);
point na = m_xy + del;
TRACE("nla_solver_tp", tout << "del = " << del << std::endl;);

View file

@ -2280,6 +2280,7 @@ public:
local_bound_propagator bp(*this);
lp().propagate_bounds_for_touched_rows(bp);
if (m.canceled()) {
return;
}