mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-07-02 05:16:08 +00:00
Code Activity

[code-simplifier] Simplify int_cube: remove goto, use aggregate/brace init (#9874)

Browse source 
Replace goto-based control flow in get_cube_delta_for_term with an
all_ok flag for structured early-exit. Use aggregate initialization for
flip_candidate, constructor-based vector sizing for occs, brace
initialization for pairs in add_edge_rows_for_term.

No functional changes - all lcube tests pass.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Nikolaj Bjorner 2026-06-29 19:18:04 -07:00 • committed by GitHub
parent 63259d8a43
commit d12d49dda1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/math/lp/int_cube.cpp
View file

@ -179,17 +179,13 @@ namespace lp {
return lra.tighten_term_bounds_by_delta(i, delta); return lra.tighten_term_bounds_by_delta(i, delta);
if (lra.column_has_upper_bound(i)) { if (lra.column_has_upper_bound(i)) {
impq u = lra.get_upper_bound(i); // copy: add_term invalidates bound references impq u = lra.get_upper_bound(i); // copy: add_term invalidates bound references
vector<std::pair<mpq, unsigned>> coeffs; vector<std::pair<mpq, unsigned>> coeffs = {{mpq(1), i}, {delta.x, x_e}};
coeffs.push_back(std::make_pair(mpq(1), i));
coeffs.push_back(std::make_pair(delta.x, x_e));
unsigned s = lra.add_term(coeffs, UINT_MAX); unsigned s = lra.add_term(coeffs, UINT_MAX);
lra.add_var_bound(s, is_zero(u.y) ? lconstraint_kind::LE : lconstraint_kind::LT, u.x); lra.add_var_bound(s, is_zero(u.y) ? lconstraint_kind::LE : lconstraint_kind::LT, u.x);
} }
if (lra.column_has_lower_bound(i)) { if (lra.column_has_lower_bound(i)) {
impq l = lra.get_lower_bound(i); // copy: add_term invalidates bound references impq l = lra.get_lower_bound(i); // copy: add_term invalidates bound references
vector<std::pair<mpq, unsigned>> coeffs; vector<std::pair<mpq, unsigned>> coeffs = {{mpq(1), i}, {-delta.x, x_e}};
coeffs.push_back(std::make_pair(mpq(1), i));
coeffs.push_back(std::make_pair(-delta.x, x_e));
unsigned s = lra.add_term(coeffs, UINT_MAX); unsigned s = lra.add_term(coeffs, UINT_MAX);
lra.add_var_bound(s, is_zero(l.y) ? lconstraint_kind::GE : lconstraint_kind::GT, l.x); lra.add_var_bound(s, is_zero(l.y) ? lconstraint_kind::GE : lconstraint_kind::GT, l.x);
} }
@ -214,10 +210,7 @@ namespace lp {
const impq& v = lra.get_column_value(j); const impq& v = lra.get_column_value(j);
if (v.is_int()) if (v.is_int())
continue; continue;
flip_candidate f; flips.push_back({j, floor(v), false});
f.m_j = j;
f.m_lo = floor(v);
flips.push_back(f);
} }
lra.round_to_integer_solution(); lra.round_to_integer_solution();
for (auto& f : flips) for (auto& f : flips)
@ -273,14 +266,13 @@ namespace lp {
for (unsigned fi = 0; fi < flips.size(); ++fi) for (unsigned fi = 0; fi < flips.size(); ++fi)
flip_of_var[flips[fi].m_j] = fi; flip_of_var[flips[fi].m_j] = fi;
// occurrences of the flip candidates in the bounded rows // occurrences of the flip candidates in the bounded rows
vector<vector<std::pair<unsigned, mpq>>> occs; vector<vector<std::pair<unsigned, mpq>>> occs(flips.size());
occs.resize(flips.size());
for (unsigned ri = 0; ri < rows.size(); ++ri) { for (unsigned ri = 0; ri < rows.size(); ++ri) {
const lar_term& t = lra.get_term(rows[ri].m_j); const lar_term& t = lra.get_term(rows[ri].m_j);
for (lar_term::ival p : t) { for (lar_term::ival p : t) {
auto it = flip_of_var.find(p.j()); auto it = flip_of_var.find(p.j());
if (it != flip_of_var.end()) if (it != flip_of_var.end())
occs[it->second].push_back(std::make_pair(ri, p.coeff())); occs[it->second].push_back({ri, p.coeff()});
} }
} }
@ -332,30 +324,24 @@ namespace lp {
impq int_cube::get_cube_delta_for_term(const lar_term& t) const { impq int_cube::get_cube_delta_for_term(const lar_term& t) const {
if (t.size() == 2) { if (t.size() == 2) {
bool seen_minus = false; bool seen_minus = false, seen_plus = false, all_ok = true;
bool seen_plus = false; for (lar_term::ival p : t) {
for(lar_term::ival p : t) { if (!lia.column_is_int(p.j())) { all_ok = false; break; }
if (!lia.column_is_int(p.j())) const mpq& c = p.coeff();
goto usual_delta; if (c == one_of_type<mpq>()) seen_plus = true;
const mpq & c = p.coeff(); else if (c == -one_of_type<mpq>()) seen_minus = true;
if (c == one_of_type<mpq>()) { else { all_ok = false; break; }
seen_plus = true; }
} else if (c == -one_of_type<mpq>()) { if (all_ok) {
seen_minus = true; if (seen_minus && seen_plus)
} else { return zero_of_type<impq>();
goto usual_delta; return impq(0, 1);
}
} }
if (seen_minus && seen_plus)
return zero_of_type<impq>();
return impq(0, 1);
} }
usual_delta:
mpq delta = zero_of_type<mpq>(); mpq delta = zero_of_type<mpq>();
for (lar_term::ival p : t) for (lar_term::ival p : t)
if (lia.column_is_int(p.j())) if (lia.column_is_int(p.j()))
delta += abs(p.coeff()); delta += abs(p.coeff());
delta *= mpq(1, 2); delta *= mpq(1, 2);
return impq(delta); return impq(delta);
} }