mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

add throttle, fixup bp.init() for proper initialization

Browse source
This commit is contained in:
Nikolaj Bjorner 2025-02-22 16:27:58 -08:00
parent c79967b2b6
commit be8febedc3
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/math/lp/int_solver.cpp
View file

@ -215,8 +215,14 @@ namespace lp {
// Tighten bounds // Tighten bounds
// expose at level of lar_solver so it can be invoked by theory_lra after back-jumping // expose at level of lar_solver so it can be invoked by theory_lra after back-jumping
// consider multi-round bound tightnening as well and deal with divergence issues. // consider multi-round bound tightnening as well and deal with divergence issues.
unsigned m_bounds_refine_depth = 0;
lia_move tighten_bounds() { lia_move tighten_bounds() {
if (m_bounds_refine_depth > 10)
return lia_move::undef;
struct bound_consumer { struct bound_consumer {
imp& i; imp& i;
bound_consumer(imp& i) : i(i) {} bound_consumer(imp& i) : i(i) {}
@ -227,11 +233,8 @@ namespace lp {
bound_consumer bc(*this); bound_consumer bc(*this);
std_vector<implied_bound> ibounds; std_vector<implied_bound> ibounds;
lp_bound_propagator<bound_consumer> bp(bc, ibounds); lp_bound_propagator<bound_consumer> bp(bc, ibounds);
bp.init();
unsigned num_refined_bounds = 0; auto set_conflict = [&](u_dependency * d1, u_dependency * d2) {
auto set_conflict = [&](unsigned j, u_dependency * d1, u_dependency * d2) {
++settings().stats().m_bounds_tightening_conflicts; ++settings().stats().m_bounds_tightening_conflicts;
for (auto e : lra.flatten(d1)) for (auto e : lra.flatten(d1))
m_ex->push_back(e); m_ex->push_back(e);
@ -239,6 +242,7 @@ namespace lp {
m_ex->push_back(e); m_ex->push_back(e);
}; };
bool bounds_refined = false;
auto refine_bound = [&](implied_bound const& ib) { auto refine_bound = [&](implied_bound const& ib) {
unsigned j = ib.m_j; unsigned j = ib.m_j;
rational bound = ib.m_bound; rational bound = ib.m_bound;
@ -249,43 +253,46 @@ namespace lp {
return l_undef; return l_undef;
auto d = ib.explain_implied(); auto d = ib.explain_implied();
if (lra.column_has_upper_bound(j) && lra.column_upper_bound(j) < bound) { if (lra.column_has_upper_bound(j) && lra.column_upper_bound(j) < bound) {
set_conflict(j, d, lra.get_column_upper_bound_witness(j)); set_conflict(d, lra.get_column_upper_bound_witness(j));
return l_false; return l_false;
} }
lra.update_column_type_and_bound(j, ib.m_strict ? lconstraint_kind::GT : lconstraint_kind::GE, bound, d); lra.update_column_type_and_bound(j, ib.m_strict ? lconstraint_kind::GT : lconstraint_kind::GE, bound, d);
++num_refined_bounds; }
} else { else {
if (lra.column_is_int(j)) if (lra.column_is_int(j))
bound = floor(bound); bound = floor(bound);
if (lra.column_has_upper_bound(j) && lra.column_upper_bound(j) <= bound) if (lra.column_has_upper_bound(j) && lra.column_upper_bound(j) <= bound)
return l_undef; return l_undef;
auto d = ib.explain_implied(); auto d = ib.explain_implied();
if (lra.column_has_lower_bound(j) && lra.column_lower_bound(j) > bound) { if (lra.column_has_lower_bound(j) && lra.column_lower_bound(j) > bound) {
set_conflict(j, d, lra.get_column_lower_bound_witness(j)); set_conflict(d, lra.get_column_lower_bound_witness(j));
return l_false; return l_false;
} }
lra.update_column_type_and_bound(j, ib.m_strict ? lconstraint_kind::LT : lconstraint_kind::LE, bound, d); lra.update_column_type_and_bound(j, ib.m_strict ? lconstraint_kind::LT : lconstraint_kind::LE, bound, d);
++num_refined_bounds;
} }
++settings().stats().m_bounds_tightenings;
bounds_refined = true;
return l_true; return l_true;
}; };
for (unsigned row_index = 0; row_index < lra.row_count(); ++row_index) { for (unsigned row_index = 0; row_index < lra.row_count(); ++row_index) {
bp.init();
bound_analyzer_on_row<row_strip<mpq>, lp_bound_propagator<bound_consumer>>::analyze_row( bound_analyzer_on_row<row_strip<mpq>, lp_bound_propagator<bound_consumer>>::analyze_row(
lra.A_r().m_rows[row_index], lra.A_r().m_rows[row_index],
zero_of_type<numeric_pair<mpq>>(), zero_of_type<numeric_pair<mpq>>(),
bp); bp);
settings().stats().m_bounds_tightenings += static_cast<unsigned>(ibounds.size());
for (auto const& ib : ibounds) for (auto const& ib : ibounds)
if (l_false == refine_bound(ib)) if (l_false == refine_bound(ib))
return lia_move::conflict; return lia_move::conflict;
ibounds.clear();
} }
return num_refined_bounds > 0 ? lia_move::continue_with_check : lia_move::undef; if (bounds_refined) {
lra.trail().push(value_trail(m_bounds_refine_depth));
++m_bounds_refine_depth;
}
return bounds_refined ? lia_move::continue_with_check : lia_move::undef;
} }