mirror of
https://github.com/Z3Prover/z3
synced 2025-08-10 05:00:51 +00:00
fixes to new solver, add mode for using nlsat solver eagerly from nla_core
This commit is contained in:
parent
9a975a4523
commit
8412ecbdbf
22 changed files with 156 additions and 164 deletions
|
@ -70,12 +70,14 @@ namespace bv {
|
|||
bits[0].resize(bv_sz, false);
|
||||
bits[1].resize(bv_sz, false);
|
||||
|
||||
sat::literal_vector assigned;
|
||||
theory_var curr = v;
|
||||
do {
|
||||
literal_vector const& lits = m_bits[curr];
|
||||
for (unsigned i = 0; i < lits.size(); i++) {
|
||||
literal l = lits[i];
|
||||
if (s().value(l) != l_undef) {
|
||||
if (l.var() == mk_true().var()) {
|
||||
assigned.push_back(l);
|
||||
unsigned is_true = s().value(l) == l_true;
|
||||
if (bits[!is_true][i]) {
|
||||
// expect a conflict later on.
|
||||
|
@ -91,7 +93,9 @@ namespace bv {
|
|||
} while (curr != v);
|
||||
|
||||
zero_one_bits const& _bits = m_zero_one_bits[v];
|
||||
SASSERT(_bits.size() == num_bits);
|
||||
if (_bits.size() != num_bits)
|
||||
std::cout << v << " " << _bits.size() << " " << num_bits << "\n";
|
||||
VERIFY(_bits.size() == num_bits);
|
||||
bool_vector already_found;
|
||||
already_found.resize(bv_sz, false);
|
||||
for (auto& zo : _bits) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue