mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-26 13:06:05 +00:00
Code Activity

Merge branch 'polysat' of https://github.com/Z3Prover/z3 into polysat

Browse source
This commit is contained in:
Clemens Eisenhofer 2022-11-29 14:54:49 +01:00
commit 2b7fd152c4
34 changed files with 948 additions and 613 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/math/polysat/constraint_manager.cpp
View file

@ -62,9 +62,11 @@ namespace polysat {
void constraint_manager::register_clause(clause* cl) {
while (m_clauses.size() <= s.base_level())
unsigned clause_level = s.base_level();
clause_level = 0; // TODO: s.base_level() may be too high, if the clause is propagated at an earlier level. For now just use 0.
while (m_clauses.size() <= clause_level)
m_clauses.push_back({});
m_clauses[s.base_level()].push_back(cl);
m_clauses[clause_level].push_back(cl);
}
void constraint_manager::store(clause* cl, bool value_propagate) {
@ -276,12 +278,24 @@ namespace polysat {
std::pair<pdd, pdd> constraint_manager::quot_rem(pdd const& a, pdd const& b) {
auto& m = a.manager();
unsigned sz = m.power_of_2();
if (a.is_val() && b.is_val()) {
rational r;
rational q = machine_div_rem(a.val(), b.val(), r);
return { m.mk_val(r), m.mk_val(q) };
if (b.is_zero()) {
// By SMT-LIB specification, b = 0 ==> q = -1, r = a.
return {m.mk_val(m.max_value()), a};
}
if (a.is_val() && b.is_val()) {
rational const av = a.val();
rational const bv = b.val();
SASSERT(!bv.is_zero());
rational rv;
rational qv = machine_div_rem(av, bv, rv);
pdd q = m.mk_val(qv);
pdd r = m.mk_val(rv);
SASSERT_EQ(a, b * q + r);
SASSERT(b.val()*q.val() + r.val() <= m.max_value());
SASSERT(r.val() <= (b*q+r).val());
SASSERT(r.val() < b.val());
return {std::move(q), std::move(r)};
}
constraint_dedup::quot_rem_args args({ a, b });
auto it = m_dedup.quot_rem_expr.find_iterator(args);
if (it != m_dedup.quot_rem_expr.end())
@ -294,18 +308,27 @@ namespace polysat {
// Axioms for quotient/remainder:
// a = b*q + r
// multiplication does not overflow in b*q
// addition does not overflow in (b*q) + r; for now expressed as: r <= bq+r (TODO: maybe the version with disjunction is easier for the solver; should compare later)
// addition does not overflow in (b*q) + r; for now expressed as: r <= bq+r
// b ≠ 0 ==> r < b
// b = 0 ==> q = -1
s.add_eq(a, b * q + r);
s.add_umul_noovfl(b, q);
s.add_ule(r, b * q + r);
// r <= b*q+r
// { apply equivalence: p <= q <=> q-p <= -p-1 }
// b*q <= -r-1
s.add_ule(b*q, -r-1);
#if 0
// b*q <= b*q+r
// { apply equivalence: p <= q <=> q-p <= -p-1 }
// r <= - b*q - 1
s.add_ule(r, -b*q-1); // redundant, but may help propagation
#endif
auto c_eq = eq(b);
s.add_clause(c_eq, ult(r, b), false);
s.add_clause(~c_eq, eq(q + 1), false);
return { q, r };
return {std::move(q), std::move(r)};
}
pdd constraint_manager::bnot(pdd const& p) {