mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-22 02:57:50 +00:00
Code Activity

add proof checker plugin

Browse source 
fixes to monomials
This commit is contained in:
Nikolaj Bjorner 2023-12-31 05:30:21 -08:00
parent 32825a26cb
commit 7bd7faa722
8 changed files with 113 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/sat/smt/polysat/core.cpp
View file

@ -491,16 +491,16 @@ namespace polysat {
return s.trail();
}
void core::add_axiom(char const* name, constraint_or_dependency_list const& cs, bool is_redundant) {
s.add_axiom(name, cs.begin(), cs.end(), is_redundant);
bool core::add_axiom(char const* name, constraint_or_dependency_list const& cs, bool is_redundant) {
return s.add_axiom(name, cs.begin(), cs.end(), is_redundant);
}
void core::add_axiom(char const* name, constraint_or_dependency const* begin, constraint_or_dependency const* end, bool is_redundant) {
s.add_axiom(name, begin, end, is_redundant);
bool core::add_axiom(char const* name, constraint_or_dependency const* begin, constraint_or_dependency const* end, bool is_redundant) {
return s.add_axiom(name, begin, end, is_redundant);
}
void core::add_axiom(char const* name, constraint_or_dependency_vector const& cs, bool is_redundant) {
s.add_axiom(name, cs.begin(), cs.end(), is_redundant);
bool core::add_axiom(char const* name, constraint_or_dependency_vector const& cs, bool is_redundant) {
return s.add_axiom(name, cs.begin(), cs.end(), is_redundant);
}
std::ostream& core::display(std::ostream& out) const {

6
src/sat/smt/polysat/core.h
View file

@ -139,9 +139,9 @@ namespace polysat {
* In other words, the clause represents the formula /\ d_i -> \/ sc_j
* Where d_i are logical interpretations of dependencies and sc_j are signed constraints.
*/
void add_axiom(char const* name, constraint_or_dependency_list const& cs, bool is_redundant);
void add_axiom(char const* name, constraint_or_dependency const* begin, constraint_or_dependency const* end, bool is_redundant);
void add_axiom(char const* name, constraint_or_dependency_vector const& cs, bool is_redundant);
bool add_axiom(char const* name, constraint_or_dependency_list const& cs, bool is_redundant);
bool add_axiom(char const* name, constraint_or_dependency const* begin, constraint_or_dependency const* end, bool is_redundant);
bool add_axiom(char const* name, constraint_or_dependency_vector const& cs, bool is_redundant);
pvar add_var(unsigned sz);
pdd var(pvar p) { return m_vars[p]; }

45
src/sat/smt/polysat/monomials.cpp
View file

@ -102,14 +102,15 @@ namespace polysat {
return l_false;
if (any_of(m_to_refine, [&](auto i) { return parity0(m_monomials[i]); }))
return l_false;
if (any_of(m_to_refine, [&](auto i) { return parity(m_monomials[i]); }))
return l_false;
if (any_of(m_to_refine, [&](auto i) { return prefix_overflow(m_monomials[i]); }))
return l_false;
if (any_of(m_to_refine, [&](auto i) { return non_overflow_monotone(m_monomials[i]); }))
return l_false;
if (any_of(m_to_refine, [&](auto i) { return mulp2(m_monomials[i]); }))
return l_false;
if (any_of(m_to_refine, [&](auto i) { return parity(m_monomials[i]); }))
return l_false;
return l_undef;
}
@ -132,7 +133,7 @@ namespace polysat {
}
bool monomials::eval_to_false(unsigned i) {
rational rhs, lhs, p_val;
rational rhs, lhs;
auto& mon = m_monomials[i];
if (!c.try_eval(mon.var, mon.val))
return false;
@ -140,11 +141,9 @@ namespace polysat {
return false;
if (rhs == mon.val)
return false;
for (unsigned j = mon.size(); j-- > 0; ) {
if (!c.try_eval(mon.args[j], p_val))
return false;
mon.arg_vals[j] = p_val;
}
for (unsigned j = mon.size(); j-- > 0; )
if (!c.try_eval(mon.args[j], mon.arg_vals[j]))
return false;
return true;
}
@ -227,7 +226,8 @@ namespace polysat {
if (i != big_index)
clause.push_back(~C.eq(mon.args[i]));
clause.push_back(C.ule(mon.args[big_index], mon.var));
return false;
c.add_axiom("~ovfl*(p,q) & q != 0 => p <= p*q", clause, true);
return true;
}
// ~ovfl*(p,q) & p*q = 1 => p = 1, q = 1
@ -254,24 +254,18 @@ namespace polysat {
return true;
}
// p * q = 0 => p = 0 or even(q)
// p * q = 0 => p = 0 or q = 0 or even(q)
// parity(p*q) > 0 => parity(p) > 0 or parity(q) > 0
bool monomials::parity0(monomial const& mon) {
if (mon.val != 0)
if (mon.val.is_odd())
return false;
if (!all_of(mon.arg_vals, [&](auto const& v) { return v.is_odd(); }))
return false;
constraint_or_dependency_vector clause;
clause.push_back(~C.eq(mon.var, 0));
for (auto const& val : mon.arg_vals)
if (!val.is_odd() || val == 0)
return false;
clause.push_back(~C.parity_at_least(mon.var, 1));
for (auto const& p : mon.args)
clause.push_back(C.eq(p));
for (auto const& p : mon.args) {
clause.push_back(C.parity_at_least(p, 1));
c.add_axiom("p * q = 0 => p = 0 or q = 0 or even(q)", clause, true);
clause.pop_back();
}
return false;
clause.push_back(C.parity_at_least(p, 1));
c.add_axiom("parity(p*q) > 0 => parity(p) > 0 or parity(q) > 0", clause, true);
return true;
}
// 0p * 0q >= 2^k => ovfl(p,q), where |p| = |q| = k
@ -305,14 +299,15 @@ namespace polysat {
continue;
if (!c.try_eval(c.var(yslice.v), y_val) || y_val != mon.arg_vals[1])
continue;
c.add_axiom("0p * 0q >= 2^k => ovfl(p,q), where |p| = |q| = k",
bool added = c.add_axiom("0p * 0q >= 2^k => ovfl(p,q), where |p| = |q| = k",
{ dependency({x, xslice}), dependency({y, yslice}),
~C.ule(mon.args[0], xmax_value),
~C.ule(mon.args[1], xmax_value),
~C.ugt(mon.var, xmax_value),
C.umul_ovfl(c.var(xslice.v), c.var(yslice.v)) },
true);
return true;
if (added)
return true;
}
}
return false;