mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-05-03 17:05:15 +00:00
Code Activity

t

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2025-12-18 13:39:21 -10:00
parent dcc39c59b1
commit 2174cf5aaf
3 changed files with 38 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/math/polynomial/polynomial_cache.cpp
View file

@ -145,6 +145,24 @@ namespace polynomial {
return m_in_cache.get(pid(p), false); return m_in_cache.get(pid(p), false);
} }
bool contains_chain(polynomial * p, polynomial * q, var x) const {
if (!m_in_cache.get(pid(p), false)) {
polynomial * const * p2 = m_poly_table.find_core(p);
if (!p2)
return false;
p = *p2;
}
if (!m_in_cache.get(pid(q), false)) {
polynomial * const * q2 = m_poly_table.find_core(q);
if (!q2)
return false;
q = *q2;
}
unsigned h = hash_u_u(pid(p), pid(q));
psc_chain_entry key(p, q, x, h);
return m_psc_chain_cache.contains(&key);
}
void psc_chain(polynomial * p, polynomial * q, var x, polynomial_ref_vector & S) { void psc_chain(polynomial * p, polynomial * q, var x, polynomial_ref_vector & S) {
p = mk_unique(p); p = mk_unique(p);
q = mk_unique(q); q = mk_unique(q);
@ -221,6 +239,10 @@ namespace polynomial {
return m_imp->contains(p); return m_imp->contains(p);
} }
bool cache::contains_chain(polynomial const * p, polynomial const * q, var x) const {
return m_imp->contains_chain(const_cast<polynomial*>(p), const_cast<polynomial*>(q), x);
}
void cache::psc_chain(polynomial const * p, polynomial const * q, var x, polynomial_ref_vector & S) { void cache::psc_chain(polynomial const * p, polynomial const * q, var x, polynomial_ref_vector & S) {
m_imp->psc_chain(const_cast<polynomial*>(p), const_cast<polynomial*>(q), x, S); m_imp->psc_chain(const_cast<polynomial*>(p), const_cast<polynomial*>(q), x, S);
} }

2
src/math/polynomial/polynomial_cache.h
View file

@ -35,9 +35,9 @@ namespace polynomial {
manager & pm() const { return m(); } manager & pm() const { return m(); }
polynomial * mk_unique(polynomial * p); polynomial * mk_unique(polynomial * p);
bool contains(const polynomial * p) const; bool contains(const polynomial * p) const;
bool contains_chain(polynomial const * p, polynomial const * q, var x) const;
void psc_chain(polynomial const * p, polynomial const * q, var x, polynomial_ref_vector & S); void psc_chain(polynomial const * p, polynomial const * q, var x, polynomial_ref_vector & S);
void factor(polynomial const * p, polynomial_ref_vector & distinct_factors); void factor(polynomial const * p, polynomial_ref_vector & distinct_factors);
void reset(); void reset();
}; };
}; };

31
src/nlsat/levelwise.cpp
View file

@ -191,7 +191,7 @@ namespace nlsat {
unsigned max_var(polynomial_ref const & p) { return m_pm.max_var(p); } unsigned max_var(polynomial_ref const & p) { return m_pm.max_var(p); }
// Wrapper to use cached PSC chain computation // Wrapper to use cached PSC chain computation
void psc_chain(polynomial_ref & p, polynomial_ref & q, unsigned x, polynomial_ref_vector & result) { void psc_chain(polynomial_ref & p, polynomial_ref & q, unsigned x, polynomial_ref_vector & result) {
m_cache.psc_chain(p, q, x, result); m_cache.psc_chain(p, q, x, result);
} }
@ -692,14 +692,17 @@ namespace nlsat {
TRACE(lws, tout << "p:"; display(tout, p) << std::endl;); TRACE(lws, tout << "p:"; display(tout, p) << std::endl;);
if (has_const_coeff(p.m_poly)) if (has_const_coeff(p.m_poly))
return; return;
if (!try_non_null_via_coeffs(p)) if (can_apply_pre_non_null_fallback(p))
fail(); apply_pre_non_null_fallback(p);
return; else
// fallback: apply the first subrule try_non_null_via_coeffs(p);
// TODO: choose between try_non_null_via_coeffs and apply_pre_non_null_fallback
apply_pre_non_null_fallback(p);
} }
bool can_apply_pre_non_null_fallback(const property & p) {
// TODO: using apply_pre_non_null_fallback as a template, query with m_cache.contains_chain if the discriminant chain has been cached
}
// If some coefficient c_j of p is constant non-zero at the sample, or // If some coefficient c_j of p is constant non-zero at the sample, or
// if c_j evaluates non-zero at the sample and we already have sgn_inv(c_j) in m_Q, // if c_j evaluates non-zero at the sample and we already have sgn_inv(c_j) in m_Q,
@ -729,9 +732,7 @@ namespace nlsat {
// sample(s)(R), degx_{i+1} (p) > 1, disc(x_{i+1} (p)(s)) ̸= 0, sgn_inv(disc(x_{i+1} (p))(R) // sample(s)(R), degx_{i+1} (p) > 1, disc(x_{i+1} (p)(s)) ̸= 0, sgn_inv(disc(x_{i+1} (p))(R)
void apply_pre_non_null_fallback(const property& p) { void apply_pre_non_null_fallback(const property& p) {
unsigned level = max_var(p.m_poly); unsigned level = max_var(p.m_poly);
unsigned deg = m_pm.degree(p.m_poly, level);
poly * pp = p.m_poly.get();
unsigned deg = m_pm.degree(pp, level);
// fallback applies only for degree > 1 // fallback applies only for degree > 1
if (deg <= 1) { if (deg <= 1) {
fail(); fail();
@ -743,12 +744,10 @@ namespace nlsat {
SASSERT (!is_zero(disc)); // p.m_poly is supposed to be square free SASSERT (!is_zero(disc)); // p.m_poly is supposed to be square free
TRACE(lws, ::nlsat::display(tout << "discriminant: ", m_solver, disc) << "\n";); TRACE(lws, ::nlsat::display(tout << "discriminant: ", m_solver, disc) << "\n";);
// If discriminant is non-constant, add sign-invariance requirement for it for_each_distinct_factor(disc, [&](const polynomial::polynomial_ref & f) {
if (!is_const(disc)) { mk_prop(prop_enum::sgn_inv, f);
for_each_distinct_factor(disc, [&](const polynomial::polynomial_ref & f) { });
mk_prop(prop_enum::sgn_inv, f);
});
}
// non_null is established by the discriminant being non-zero at the sample // non_null is established by the discriminant being non-zero at the sample
} }