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

adding pb

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-03-14 16:41:12 -07:00
parent c1c0f776fb
commit f9193af85d
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/sat/sat_local_search.cpp
View file

@ -79,16 +79,18 @@ namespace sat {
// figure out slack, and init unsat stack // figure out slack, and init unsat stack
void local_search::init_slack() { void local_search::init_slack() {
for (unsigned v = 0; v < num_vars(); ++v) {
bool is_true = cur_solution(v);
coeff_vector& truep = m_vars[v].m_watch[is_true];
for (unsigned i = 0; i < truep.size(); ++i) {
unsigned c = truep[i].m_constraint_id;
constraint& cn = m_constraints[c];
cn.m_slack -= truep[i].m_coeff;
}
}
for (unsigned c = 0; c < num_constraints(); ++c) { for (unsigned c = 0; c < num_constraints(); ++c) {
constraint & cn = m_constraints[c];
for (unsigned i = 0; i < cn.size(); ++i) {
bool_var v = cn[i].var();
if (is_true(cn[i]))
--cn.m_slack;
}
// constraint_slack[c] = constraint_k[c] - true_terms_count[c];
// violate the at-most-k constraint // violate the at-most-k constraint
if (cn.m_slack < 0) if (m_constraints[c].m_slack < 0)
unsat(c); unsat(c);
} }
} }
@ -497,7 +499,7 @@ namespace sat {
int slack = constraint_slack(it->m_constraint_id); int slack = constraint_slack(it->m_constraint_id);
if (slack < 0) if (slack < 0)
++best_bsb; ++best_bsb;
else if (slack == 0) else if (slack < static_cast<int>(it->m_coeff))
best_bsb += num_unsat; best_bsb += num_unsat;
} }
++cit; ++cit;
@ -518,7 +520,7 @@ namespace sat {
++bsb; ++bsb;
} }
} }
else if (slack == 0) { else if (slack < static_cast<int>(it->m_coeff)) {
bsb += num_unsat; bsb += num_unsat;
if (bsb > best_bsb) { if (bsb > best_bsb) {
break; break;
@ -565,8 +567,9 @@ namespace sat {
for (; it != end; ++it) { for (; it != end; ++it) {
unsigned ci = it->m_constraint_id; unsigned ci = it->m_constraint_id;
constraint& c = m_constraints[ci]; constraint& c = m_constraints[ci];
--c.m_slack; int old_slack = c.m_slack;
if (c.m_slack == -1) { // from 0 to -1: sat -> unsat c.m_slack -= it->m_coeff;
if (c.m_slack < 0 && old_slack >= 0) { // from non-negative to negative: sat -> unsat
unsat(ci); unsat(ci);
} }
} }
@ -574,8 +577,9 @@ namespace sat {
for (; it != end; ++it) { for (; it != end; ++it) {
unsigned ci = it->m_constraint_id; unsigned ci = it->m_constraint_id;
constraint& c = m_constraints[ci]; constraint& c = m_constraints[ci];
++c.m_slack; int old_slack = c.m_slack;
if (c.m_slack == 0) { // from -1 to 0: unsat -> sat c.m_slack += it->m_coeff;
if (c.m_slack >= 0 && old_slack < 0) { // from negative to non-negative: unsat -> sat
sat(ci); sat(ci);
} }
} }