mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-08 01:57:59 +00:00
Code Activity

Enforce bound polynomial LC protection in compute_omit_lc functions

Browse source 
Move the invariant that bound-defining polynomials must never have their
LC omitted from add_level_projections_sector() into the source functions:
- compute_omit_lc_both_sides()
- compute_omit_lc_chain_extremes()

This centralizes the protection and removes the redundant override check.
This commit is contained in:
Lev Nachmanson 2026-01-24 12:03:59 -10:00
parent 831a02a1dd
commit 7ffc5d9eb1
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/nlsat/levelwise.cpp
View file

@ -658,11 +658,17 @@ namespace nlsat {
if (require_leaf)
compute_resultant_graph_degree();
// Identify bound polynomial indices (must never omit LC)
unsigned l_bound_idx = is_set(m_l_rf) ? m_rel.m_rfunc[m_l_rf].ps_idx : UINT_MAX;
unsigned u_bound_idx = is_set(m_u_rf) ? m_rel.m_rfunc[m_u_rf].ps_idx : UINT_MAX;
for (unsigned i = 0; i < m_level_ps.size(); ++i) {
if (m_side_mask[i] != 3)
continue;
if (require_leaf && m_deg_in_order_graph[i] != 1)
continue;
if (i == l_bound_idx || i == u_bound_idx)
continue;
m_omit_lc[i] = true;
}
}
@ -681,14 +687,18 @@ namespace nlsat {
compute_side_mask();
unsigned n = m_rel.m_rfunc.size();
// Lower extreme: omit if it also appears on upper side
// Identify bound polynomial indices (must never omit LC)
unsigned l_bound_idx = is_set(m_l_rf) ? m_rel.m_rfunc[m_l_rf].ps_idx : UINT_MAX;
unsigned u_bound_idx = is_set(m_u_rf) ? m_rel.m_rfunc[m_u_rf].ps_idx : UINT_MAX;
// Lower extreme: omit if it also appears on upper side (and not a bound)
unsigned idx_lower = m_rel.m_rfunc[0].ps_idx;
if (m_side_mask[idx_lower] & 2)
if ((m_side_mask[idx_lower] & 2) && idx_lower != l_bound_idx && idx_lower != u_bound_idx)
m_omit_lc[idx_lower] = true;
// Upper extreme: omit if it also appears on lower side
// Upper extreme: omit if it also appears on lower side (and not a bound)
unsigned idx_upper = m_rel.m_rfunc[n - 1].ps_idx;
if (m_side_mask[idx_upper] & 1)
if ((m_side_mask[idx_upper] & 1) && idx_upper != l_bound_idx && idx_upper != u_bound_idx)
m_omit_lc[idx_upper] = true;
}
@ -1475,11 +1485,6 @@ namespace nlsat {
bool is_lower_bound = is_set(m_l_rf) && i == m_rel.m_rfunc[m_l_rf].ps_idx;
bool is_upper_bound = is_set(m_u_rf) && i == m_rel.m_rfunc[m_u_rf].ps_idx;
// Per Algorithm 2, Line 13 of projective_delineability.pdf:
// Bound-defining polynomials MUST have their LC projected for delineability
if (is_lower_bound || is_upper_bound)
add_lc = true;
TRACE(lws,
tout << " poly[" << i << "] is_lower=" << is_lower_bound << " is_upper=" << is_upper_bound;
tout << " omit_lc[i]=" << (i < m_omit_lc.size() ? (m_omit_lc[i] ? "true" : "false") : "N/A");