mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

fix #3045 fix #3046

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-02-19 07:22:10 -08:00
parent 290b4dfabc
commit a4d81b2847
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/qe/nlqsat.cpp
View file

@ -433,7 +433,7 @@ namespace qe {
s.m_solver.vars(l, vs); s.m_solver.vars(l, vs);
TRACE("qe", s.m_solver.display(tout << vs << " ", l) << "\n";); TRACE("qe", s.m_solver.display(tout << vs << " ", l) << "\n";);
for (unsigned v : vs) { for (unsigned v : vs) {
level.merge(s.m_rvar2level[v]); level.merge(s.m_rvar2level.get(v, max_level()));
} }
set_level(l.var(), level); set_level(l.var(), level);
return level; return level;

4
src/sat/sat_aig_cuts.cpp
View file

@ -140,7 +140,6 @@ namespace sat {
r |= ((n.lut() >> w) & 0x1) << j; r |= ((n.lut() >> w) & 0x1) << j;
} }
a.set_table(r); a.set_table(r);
std::cout << a << "\n";
insert_cut(v, a, cs); insert_cut(v, a, cs);
} }
@ -149,6 +148,9 @@ namespace sat {
literal l1 = child(n, 0); literal l1 = child(n, 0);
literal l2 = child(n, 1); literal l2 = child(n, 1);
literal l3 = child(n, 2); literal l3 = child(n, 2);
VERIFY(&cs != &m_cuts[l1.var()]);
VERIFY(&cs != &m_cuts[l2.var()]);
VERIFY(&cs != &m_cuts[l3.var()]);
for (auto const& a : m_cuts[l1.var()]) { for (auto const& a : m_cuts[l1.var()]) {
for (auto const& b : m_cuts[l2.var()]) { for (auto const& b : m_cuts[l2.var()]) {
cut ab; cut ab;

13
src/tactic/core/pb_preprocess_tactic.cpp
View file

@ -418,8 +418,7 @@ private:
} }
bool pure_args(app* a) const { bool pure_args(app* a) const {
for (unsigned i = 0; i < a->get_num_args(); ++i) { for (expr* e : *a) {
expr* e = a->get_arg(i);
m.is_not(e, e); m.is_not(e, e);
if (!is_uninterp_const(e) && !m.is_true(e) && !m.is_false(e)) { if (!is_uninterp_const(e) && !m.is_true(e) && !m.is_false(e)) {
return false; return false;
@ -566,7 +565,8 @@ private:
} }
else if (pb.is_ge(e)) { else if (pb.is_ge(e)) {
app* a = to_app(e); app* a = to_app(e);
SASSERT(pure_args(a)); if (!pure_args(a))
return false;
for (unsigned i = 0; i < a->get_num_args(); ++i) { for (unsigned i = 0; i < a->get_num_args(); ++i) {
args.push_back(a->get_arg(i)); args.push_back(a->get_arg(i));
coeffs.push_back(pb.get_coeff(a, i)); coeffs.push_back(pb.get_coeff(a, i));
@ -575,9 +575,10 @@ private:
} }
else if (m.is_or(e)) { else if (m.is_or(e)) {
app* a = to_app(e); app* a = to_app(e);
SASSERT(pure_args(a)); if (!pure_args(a))
for (unsigned i = 0; i < a->get_num_args(); ++i) { return false;
args.push_back(a->get_arg(i)); for (expr* arg : *a) {
args.push_back(arg);
coeffs.push_back(rational::one()); coeffs.push_back(rational::one());
} }
k = rational::one(); k = rational::one();