mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-22 11:07:51 +00:00
Code Activity

weed out some bugs, add more bv op support in intblast and polysat solvers

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2023-12-14 10:35:13 -08:00
parent 01e5d2dbf1
commit e251b5e9d0
6 changed files with 132 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,14 +140,14 @@ namespace polysat {
for (; i < sz && j < 2; ++i)
if (!is_assigned(vars[i]))
std::swap(vars[i], vars[j++]);
sc.set_num_watch(i);
if (i > 0)
sc.set_num_watch(j);
if (j > 0)
add_watch(idx, vars[0]);
if (i > 1)
if (j > 1)
add_watch(idx, vars[1]);
IF_VERBOSE(10, verbose_stream() << "add watch " << sc << " " << vars << " ";
if (vars.size() > 0) verbose_stream() << "( " << idx << " : " << m_watch[vars[0]] << ") ";
if (vars.size() > 1) verbose_stream() << "( " << idx << " : " << m_watch[vars[1]] << ") ";
if (j > 0) verbose_stream() << "( " << idx << " : " << m_watch[vars[0]] << ") ";
if (j > 1) verbose_stream() << "( " << idx << " : " << m_watch[vars[1]] << ") ";
verbose_stream() << "\n");
s.trail().push(mk_add_watch(*this));
return idx;
@ -227,7 +227,6 @@ namespace polysat {
m_assignment.push(v , value);
s.trail().push(mk_assign_var(v, *this));
return;
// update the watch lists for pvars
// remove constraints from m_watch[v] that have more than 2 free variables.
// for entries where there is only one free variable left add to viable set
@ -242,7 +241,7 @@ namespace polysat {
bool swapped = false;
for (unsigned i = vars.size(); i-- > 2; ) {
if (!is_assigned(vars[i])) {
verbose_stream() << "watch instead " << idx << " " << vars[i] << "instead of " << vars[0] << "\n";
verbose_stream() << "watch instead " << vars[i] << " instead of " << vars[0] << " for " << idx << "\n";
add_watch(idx, vars[i]);
std::swap(vars[i], vars[0]);
swapped = true;

18
src/sat/smt/polysat/types.h
View file

@ -59,24 +59,6 @@ namespace polysat {
return out << "v" << d.eq().first << " == v" << d.eq().second << "@" << d.level();
}
struct trailing_bits {
unsigned length;
rational bits;
bool positive;
unsigned src_idx;
};
struct leading_bits {
unsigned length;
bool positive; // either all 0 or all 1
unsigned src_idx;
};
struct single_bit {
bool positive;
unsigned position;
unsigned src_idx;
};
struct fixed_bits {
unsigned hi = 0;

20
src/sat/smt/polysat/viable.h
View file

@ -33,6 +33,26 @@ namespace polysat {
resource_out,
};
struct trailing_bits {
unsigned length;
rational bits;
bool positive;
unsigned src_idx;
};
struct leading_bits {
unsigned length;
bool positive; // either all 0 or all 1
unsigned src_idx;
};
struct single_bit {
bool positive;
unsigned position;
unsigned src_idx;
};
class core;
class constraints;