mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

merge

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-01-13 16:15:51 -08:00
commit 7e0920e362
8 changed files with 119 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

91
src/sat/ba_solver.cpp
View file

@ -446,7 +446,7 @@ namespace sat {
}
/*
\brief slit PB constraint into two because root is reused in arguments.
\brief split PB constraint into two because root is reused in arguments.
x <=> a*x + B*y >= k
@ -825,6 +825,9 @@ namespace sat {
p.set_k(k);
SASSERT(p.well_formed());
if (clausify(p)) {
return;
}
if (p.lit() == null_literal || value(p.lit()) == l_true) {
init_watch(p);
}
@ -1543,6 +1546,9 @@ namespace sat {
s().mk_clause(_lits.size(), _lits.c_ptr(), learned);
return 0;
}
if (!learned && clausify(lit, lits.size(), lits.c_ptr(), k)) {
return 0;
}
void * mem = m_allocator.allocate(card::get_obj_size(lits.size()));
card* c = new (mem) card(next_id(), lit, lits, k);
c->set_learned(learned);
@ -2369,13 +2375,16 @@ namespace sat {
SASSERT(s().at_base_lvl());
switch (c.tag()) {
case card_t:
simplify(c.to_card());
if (!clausify(c.to_card()))
simplify(c.to_card());
break;
case pb_t:
simplify(c.to_pb());
if (!clausify(c.to_pb()))
simplify(c.to_pb());
break;
case xor_t:
simplify(c.to_xor());
if (!clausify(c.to_xor()))
simplify(c.to_xor());
break;
default:
UNREACHABLE();
@ -2479,8 +2488,9 @@ namespace sat {
}
void ba_solver::ba_sort::mk_clause(unsigned n, literal const* lits) {
literal_vector _lits(n, lits);
s.s().mk_clause(n, _lits.c_ptr());
m_lits.reset();
m_lits.append(n, lits);
s.s().mk_clause(n, m_lits.c_ptr());
}
// -------------------------------
@ -2622,8 +2632,25 @@ namespace sat {
}
}
bool ba_solver::clausify(literal lit, unsigned n, literal const* lits, unsigned k) {
bool is_def = lit != null_literal;
if ((!is_def || !s().was_eliminated(lit)) &&
!std::any_of(lits, lits + n, [&](literal l) { return s().was_eliminated(l); })) {
literal def_lit = m_sort.ge(is_def, k, n, lits);
if (is_def) {
s().mk_clause(~lit, def_lit);
s().mk_clause( lit, ~def_lit);
}
return true;
}
return false;
}
bool ba_solver::clausify(xor& x) {
return false;
}
bool ba_solver::clausify(card& c) {
#if 0
if (get_config().m_card_solver)
return false;
@ -2631,18 +2658,54 @@ namespace sat {
// TBD: conditions for when to clausify are TBD and
// handling of conditional cardinality as well.
//
if (c.lit() == null_literal) {
if (!c.learned() && !std::any_of(c.begin(), c.end(), [&](literal l) { return s().was_eliminated(l.var()); })) {
IF_VERBOSE(0, verbose_stream() << "clausify " << c << "\n";
m_sort.ge(false, c.k(), c.size(), c.begin());
}
remove_constraint(c, "recompiled to clauses");
if (!c.learned() && clausify(c.lit(), c.size(), c.begin(), c.k())) {
IF_VERBOSE(0, verbose_stream() << "clausify " << c << "\n";);
// compiled
}
remove_constraint(c, "recompiled to clauses");
return true;
}
bool ba_solver::clausify(pb& p) {
if (get_config().m_card_solver)
return false;
bool ok = !p.learned();
bool is_def = p.lit() != null_literal;
for (wliteral wl : p) {
ok &= !s().was_eliminated(wl.second);
}
ok &= !is_def || !s().was_eliminated(p.lit());
if (!ok) {
remove_constraint(p, "recompiled to clauses");
return true;
}
if (is_cardinality(p, m_lemma)) {
literal lit = m_sort.ge(is_def, p.k(), m_lemma.size(), m_lemma.c_ptr());
if (is_def) {
s().mk_clause(p.lit(), ~lit);
s().mk_clause(~p.lit(), lit);
}
remove_constraint(p, "recompiled to clauses");
return true;
}
#endif
return false;
}
bool ba_solver::is_cardinality(pb const& p, literal_vector& lits) {
lits.reset();
p.size();
for (wliteral wl : p) {
if (lits.size() > 2*p.size() + wl.first) {
return false;
}
for (unsigned i = 0; i < wl.first; ++i) {
lits.push_back(wl.second);
}
}
return true;
}
void ba_solver::split_root(constraint& c) {
switch (c.tag()) {

5
src/sat/ba_solver.h
View file

@ -234,6 +234,7 @@ namespace sat {
struct ba_sort {
ba_solver& s;
literal m_true;
literal_vector m_lits;
typedef sat::literal literal;
typedef sat::literal_vector literal_vector;
@ -343,6 +344,7 @@ namespace sat {
void flush_roots(card& c);
void recompile(card& c);
bool clausify(card& c);
bool clausify(literal lit, unsigned n, literal const* lits, unsigned k);
lbool eval(card const& c) const;
double get_reward(card const& c, literal_occs_fun& occs) const;
@ -355,6 +357,7 @@ namespace sat {
void get_xor_antecedents(literal l, unsigned index, justification js, literal_vector& r);
void get_antecedents(literal l, xor const& x, literal_vector & r);
void simplify(xor& x);
bool clausify(xor& x);
void flush_roots(xor& x);
lbool eval(xor const& x) const;
@ -371,6 +374,8 @@ namespace sat {
bool is_cardinality(pb const& p);
void flush_roots(pb& p);
void recompile(pb& p);
bool clausify(pb& p);
bool is_cardinality(pb const& p, literal_vector& lits);
lbool eval(pb const& p) const;
double get_reward(pb const& p, literal_occs_fun& occs) const;

1
src/sat/tactic/goal2sat.cpp
View file

@ -880,7 +880,6 @@ void goal2sat::get_interpreted_atoms(expr_ref_vector& atoms) {
sat2goal::mc::mc(ast_manager& m): m(m), m_var2expr(m) {}
void sat2goal::mc::flush_smc(sat::solver& s, atom2bool_var const& map) {
s.flush(m_smc);
m_var2expr.resize(s.num_vars());