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

build fix

Browse source
This commit is contained in:
Nikolaj Bjorner 2020-09-02 12:35:12 -07:00
parent daf7e9e3ef
commit 7c2fe46eb7
7 changed files with 46 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/sat/smt/ba_solver.cpp
View file

@ -1598,7 +1598,7 @@ namespace sat {
TRACE("ba", tout << m_lemma << "\n";);
if (get_config().m_drat && m_solver) {
s().m_drat.add(m_lemma, sat::status::ba_redundant());
s().m_drat.add(m_lemma, sat::status::ba(true));
}
s().m_lemma.reset();
@ -2140,7 +2140,7 @@ namespace sat {
for (literal lit : r)
lits.push_back(~lit);
lits.push_back(l);
s().m_drat.add(lits, sat::status::ba_redundant());
s().m_drat.add(lits, sat::status::ba(true));
}
}
@ -2923,7 +2923,7 @@ namespace sat {
}
if (all_units && sz < k) {
if (c.lit() == null_literal) {
s().mk_clause(0, nullptr, status::ba_redundant());
s().mk_clause(0, nullptr, status::ba(c.learned()));
}
else {
literal lit = ~c.lit();

4
src/sat/smt/euf_ackerman.cpp
View file

@ -194,7 +194,7 @@ namespace euf {
}
expr_ref eq(m.mk_eq(a, b), m);
lits.push_back(s.internalize(eq, false, false, true));
s.s().mk_clause(lits, sat::status::euf_learned());
s.s().mk_clause(lits, sat::status::euf(true));
}
void ackerman::add_eq(expr* a, expr* b, expr* c) {
@ -205,6 +205,6 @@ namespace euf {
lits[0] = s.internalize(eq1, true, false, true);
lits[1] = s.internalize(eq2, true, false, true);
lits[2] = s.internalize(eq3, false, false, true);
s.s().mk_clause(3, lits, sat::status::euf_learned());
s.s().mk_clause(3, lits, sat::status::euf(true));
}
}

10
src/sat/smt/euf_internalize.cpp
View file

@ -103,8 +103,8 @@ namespace euf {
if (lit.sign()) {
sat::bool_var v = si.add_bool_var(n->get_owner());
sat::literal lit2 = literal(v, false);
s().mk_clause(~lit, lit2, sat::status::euf_asserted());
s().mk_clause(lit, ~lit2, sat::status::euf_asserted());
s().mk_clause(~lit, lit2, sat::status::euf(false));
s().mk_clause(lit, ~lit2, sat::status::euf(false));
lit = lit2;
}
sat::bool_var v = lit.var();
@ -132,7 +132,7 @@ namespace euf {
if (sz <= 1)
return;
sat::status st = m_is_redundant ? sat::status::euf_learned() : sat::status::euf_asserted();
sat::status st = sat::status::euf(m_is_redundant);
static const unsigned distinct_max_args = 32;
if (sz <= distinct_max_args) {
sat::literal_vector lits;
@ -175,7 +175,7 @@ namespace euf {
SASSERT(m.is_distinct(e));
static const unsigned distinct_max_args = 32;
unsigned sz = e->get_num_args();
sat::status st = m_is_redundant ? sat::status::euf_learned() : sat::status::euf_asserted();
sat::status st = sat::status::euf(m_is_redundant);
if (sz <= 1) {
s().mk_clause(0, nullptr, st);
return;
@ -209,7 +209,7 @@ namespace euf {
void solver::axiomatize_basic(enode* n) {
expr* e = n->get_owner();
sat::status st = m_is_redundant ? sat::status::euf_learned() : sat::status::euf_asserted();
sat::status st = sat::status::euf(m_is_redundant);
if (m.is_ite(e)) {
app* a = to_app(e);
expr* c = a->get_arg(0);

2
src/sat/smt/euf_proof.cpp
View file

@ -49,7 +49,7 @@ namespace euf {
for (literal lit : r) lits.push_back(~lit);
if (l != sat::null_literal)
lits.push_back(l);
s().get_drat().add(lits, sat::status::euf_learned());
s().get_drat().add(lits, sat::status::euf(true));
}
}