mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-28 19:01:29 +00:00
Code Activity

fix static

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-01-18 10:44:40 -08:00
parent 7b8101c502
commit c7ee532173
7 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/sat/ba_solver.cpp
View file

@ -111,7 +111,7 @@ namespace sat {
// card
ba_solver::card::card(unsigned id, literal lit, literal_vector const& lits, unsigned k):
pb_base(card_t, id, lit, lits.size(), get_obj_size(lits.size()), k) {
pb_base(card_t, id, lit, lits.size(), get_obj_size(lits.size()), k) {
for (unsigned i = 0; i < size(); ++i) {
m_lits[i] = lits[i];
}
@ -420,17 +420,18 @@ namespace sat {
sz = j;
// _bad_id = p.id();
BADLOG(display(verbose_stream() << "simplify ", p, true));
p.set_size(sz);
p.set_k(p.k() - true_val);
if (p.k() == 1 && p.lit() == null_literal) {
unsigned k = p.k() - true_val;
if (k == 1 && p.lit() == null_literal) {
literal_vector lits(sz, p.literals().c_ptr());
s().mk_clause(sz, lits.c_ptr(), p.learned());
remove_constraint(p, "is clause");
return;
}
else if (p.lit() == null_literal || value(p.lit()) == l_true) {
p.set_size(sz);
p.set_k(k);
if (p.lit() == null_literal || value(p.lit()) == l_true) {
init_watch(p);
}
else {
@ -2621,6 +2622,7 @@ namespace sat {
return;
}
VERIFY(c.size() - c.k() >= sz - k);
c.set_size(sz);
c.set_k(k);