mirror of
https://github.com/Z3Prover/z3
synced 2025-08-05 19:00:25 +00:00
fixes for #3376
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
51ffaae396
commit
4c5c17c7d8
3 changed files with 5 additions and 2 deletions
|
@ -1246,7 +1246,9 @@ bool core::conflict_found() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool core::done() 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) {
|
lbool core::incremental_linearization(bool constraint_derived) {
|
||||||
|
|
|
@ -134,7 +134,7 @@ struct imp {
|
||||||
SASSERT(plane_is_correct_cut(a));
|
SASSERT(plane_is_correct_cut(a));
|
||||||
int steps = 10;
|
int steps = 10;
|
||||||
point del = a - m_xy;
|
point del = a - m_xy;
|
||||||
while (steps--) {
|
while (steps-- && !c().done()) {
|
||||||
del *= rational(2);
|
del *= rational(2);
|
||||||
point na = m_xy + del;
|
point na = m_xy + del;
|
||||||
TRACE("nla_solver_tp", tout << "del = " << del << std::endl;);
|
TRACE("nla_solver_tp", tout << "del = " << del << std::endl;);
|
||||||
|
|
|
@ -2280,6 +2280,7 @@ public:
|
||||||
local_bound_propagator bp(*this);
|
local_bound_propagator bp(*this);
|
||||||
|
|
||||||
lp().propagate_bounds_for_touched_rows(bp);
|
lp().propagate_bounds_for_touched_rows(bp);
|
||||||
|
|
||||||
if (m.canceled()) {
|
if (m.canceled()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue