mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-21 13:23:39 +00:00
Code Activity

viable::entry::refined can be a boolean flag

Browse source 
because we always copy the 'src' from the original entry to the refined one
This commit is contained in:
Jakob Rath 2023-08-08 14:35:26 +02:00
parent 036a3f31ca
commit e832325a8b
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/math/polysat/viable.cpp
View file

@ -78,8 +78,7 @@ namespace polysat {
if (m_alloc.empty()) if (m_alloc.empty())
return alloc(entry); return alloc(entry);
auto* e = m_alloc.back(); auto* e = m_alloc.back();
e->fi_record::reset(); e->reset();
e->refined.reset();
m_alloc.pop_back(); m_alloc.pop_back();
return e; return e;
} }
@ -589,7 +588,7 @@ namespace {
// TODO: We might also extend simultaneously up and downwards if we want the actual interval (however, this might make use of more fixed bits and is weaker - worse - therefore) // TODO: We might also extend simultaneously up and downwards if we want the actual interval (however, this might make use of more fixed bits and is weaker - worse - therefore)
entry* ne = alloc_entry(); entry* ne = alloc_entry();
rational new_val = extend_by_bits<FORWARD>(v_pdd, val, fixed, justifications, ne->src, ne->side_cond, ne->refined); rational new_val = extend_by_bits<FORWARD>(v_pdd, val, fixed, justifications, ne->src, ne->side_cond);
if (new_val == val) { if (new_val == val) {
m_alloc.push_back(ne); m_alloc.push_back(ne);
@ -597,8 +596,10 @@ namespace {
} }
// TODO: Extend in both directions? (Less justifications vs. bigger intervals) // TODO: Extend in both directions? (Less justifications vs. bigger intervals)
rational new_val2 = extend_by_bits<!FORWARD>(v_pdd, val, fixed, justifications, ne->src, ne->side_cond, ne->refined); // TODO: could also try to extend backwards as much as we can without introducing new justifications?
rational new_val2 = extend_by_bits<!FORWARD>(v_pdd, val, fixed, justifications, ne->src, ne->side_cond);
ne->refined = true;
ne->coeff = 1; ne->coeff = 1;
ne->bit_width = s.size(v); ne->bit_width = s.size(v);
if (FORWARD) { if (FORWARD) {
@ -659,7 +660,7 @@ namespace {
// No solution // No solution
LOG("refined: no solution due to parity"); LOG("refined: no solution due to parity");
entry* ne = alloc_entry(); entry* ne = alloc_entry();
ne->refined.push_back(e); ne->refined = true;
ne->src = e->src; ne->src = e->src;
ne->side_cond = e->side_cond; ne->side_cond = e->side_cond;
ne->coeff = 1; ne->coeff = 1;
@ -677,7 +678,7 @@ namespace {
LOG("refined to [" << num_pp(s, v, lo) << ", " << num_pp(s, v, hi) << "["); LOG("refined to [" << num_pp(s, v, lo) << ", " << num_pp(s, v, hi) << "[");
SASSERT_EQ(mod(a * hi, mod_value), b); // hi is the solution SASSERT_EQ(mod(a * hi, mod_value), b); // hi is the solution
entry* ne = alloc_entry(); entry* ne = alloc_entry();
ne->refined.push_back(e); ne->refined = true;
ne->src = e->src; ne->src = e->src;
ne->side_cond = e->side_cond; ne->side_cond = e->side_cond;
ne->coeff = 1; ne->coeff = 1;
@ -710,7 +711,7 @@ namespace {
SASSERT_EQ(mod(a * (lo - 1), mod_value), b); // lo-1 is a solution SASSERT_EQ(mod(a * (lo - 1), mod_value), b); // lo-1 is a solution
SASSERT_EQ(mod(a * hi, mod_value), b); // hi is a solution SASSERT_EQ(mod(a * hi, mod_value), b); // hi is a solution
entry* ne = alloc_entry(); entry* ne = alloc_entry();
ne->refined.push_back(e); ne->refined = true;
ne->src = e->src; ne->src = e->src;
ne->side_cond = e->side_cond; ne->side_cond = e->side_cond;
ne->coeff = 1; ne->coeff = 1;
@ -739,7 +740,7 @@ namespace {
if (hi == mod_value) if (hi == mod_value)
hi = 0; hi = 0;
entry* ne = alloc_entry(); entry* ne = alloc_entry();
ne->refined.push_back(e); ne->refined = true;
ne->src = e->src; ne->src = e->src;
ne->side_cond = e->side_cond; ne->side_cond = e->side_cond;
ne->coeff = 1; ne->coeff = 1;
@ -839,7 +840,7 @@ namespace {
pdd lop = s.var2pdd(v).mk_val(lo); pdd lop = s.var2pdd(v).mk_val(lo);
pdd hip = s.var2pdd(v).mk_val(hi); pdd hip = s.var2pdd(v).mk_val(hi);
entry* ne = alloc_entry(); entry* ne = alloc_entry();
ne->refined.push_back(e); ne->refined = true;
ne->src = e->src; ne->src = e->src;
ne->side_cond = e->side_cond; ne->side_cond = e->side_cond;
ne->coeff = 1; ne->coeff = 1;
@ -856,7 +857,7 @@ namespace {
// Skips all values that are not feasible w.r.t. fixed bits // Skips all values that are not feasible w.r.t. fixed bits
template<bool FORWARD> template<bool FORWARD>
rational viable::extend_by_bits(const pdd& var, const rational& bound, const svector<lbool>& fixed, const vector<ptr_vector<entry>>& justifications, vector<signed_constraint>& src, vector<signed_constraint>& side_cond, ptr_vector<entry const>& refined) const { rational viable::extend_by_bits(const pdd& var, const rational& bound, const svector<lbool>& fixed, const vector<ptr_vector<entry>>& justifications, vector<signed_constraint>& src, vector<signed_constraint>& side_cond) const {
unsigned k = var.power_of_2(); unsigned k = var.power_of_2();
if (fixed.empty()) if (fixed.empty())
return bound; return bound;
@ -872,7 +873,6 @@ namespace {
side_cond.push_back(sc); side_cond.push_back(sc);
for (auto& c : add->src) for (auto& c : add->src)
src.push_back(c); src.push_back(c);
refined.push_back(add);
} }
}; };
@ -1423,7 +1423,7 @@ namespace {
do { do {
found = false; found = false;
do { do {
if (e->refined.empty() && e->side_cond.empty()) { if (!e->refined && e->side_cond.empty()) {
auto const& lo = e->interval.lo(); auto const& lo = e->interval.lo();
auto const& hi = e->interval.hi(); auto const& hi = e->interval.hi();
if (lo.is_val() && hi.is_val()) { if (lo.is_val() && hi.is_val()) {
@ -1459,7 +1459,7 @@ namespace {
do { do {
found = false; found = false;
do { do {
if (e->refined.empty() && e->side_cond.empty()) { if (!e->refined && e->side_cond.empty()) {
auto const& lo = e->interval.lo(); auto const& lo = e->interval.lo();
auto const& hi = e->interval.hi(); auto const& hi = e->interval.hi();
if (lo.is_val() && hi.is_val()) { if (lo.is_val() && hi.is_val()) {
@ -1821,17 +1821,9 @@ namespace {
entry const* first = m_units[v].get_entries(s.size(v)); // TODO: take other sizes into account entry const* first = m_units[v].get_entries(s.size(v)); // TODO: take other sizes into account
entry const* e = first; entry const* e = first;
do { do {
ptr_vector<entry const> to_process = e->refined; // in the first step we're only interested in entries from refinement
while (!to_process.empty()) { if (e->refined) {
auto current = to_process.back(); for (signed_constraint const src : e->src) {
to_process.pop_back();
if (!current->refined.empty()) {
for (auto& ref : current->refined)
to_process.push_back(ref);
continue;
}
const entry* origin = current;
for (const auto& src : origin->src) {
sat::literal const lit = src.blit(); sat::literal const lit = src.blit();
if (!added.contains(lit)) { if (!added.contains(lit)) {
added.insert(lit); added.insert(lit);

12
src/math/polysat/viable.h
View file

@ -79,8 +79,16 @@ namespace polysat {
forbidden_intervals m_forbidden_intervals; forbidden_intervals m_forbidden_intervals;
struct entry final : public dll_base<entry>, public fi_record { struct entry final : public dll_base<entry>, public fi_record {
ptr_vector<entry const> refined; /// whether the entry has been created by refinement (from constraints in 'fi_record::src')
bool refined = false;
void reset() {
// dll_base<entry>::init(this); // we never did this in alloc_entry either
fi_record::reset();
refined = false;
}
}; };
enum class entry_kind { unit_e, equal_e, diseq_e }; enum class entry_kind { unit_e, equal_e, diseq_e };
struct layer final { struct layer final {
@ -127,7 +135,7 @@ namespace polysat {
bool refine_disequal_lin(pvar v, rational const& val); bool refine_disequal_lin(pvar v, rational const& val);
template<bool FORWARD> template<bool FORWARD>
rational extend_by_bits(const pdd& var, const rational& bounds, const svector<lbool>& fixed, const vector<ptr_vector<entry>>& justifications, vector<signed_constraint>& src, vector<signed_constraint>& side_cond, ptr_vector<entry const>& refined) const; rational extend_by_bits(const pdd& var, const rational& bounds, const svector<lbool>& fixed, const vector<ptr_vector<entry>>& justifications, vector<signed_constraint>& src, vector<signed_constraint>& side_cond) const;
bool collect_bit_information(pvar v, bool add_conflict, svector<lbool>& fixed, vector<ptr_vector<entry>>& justifications); bool collect_bit_information(pvar v, bool add_conflict, svector<lbool>& fixed, vector<ptr_vector<entry>>& justifications);
#if 0 #if 0