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

experiments with ccc

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-09-19 08:19:08 -07:00
parent b70da2a555
commit 431d318958
5 changed files with 151 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/sat/ba_solver.cpp
View file

@ -1812,14 +1812,18 @@ namespace sat {
}
}
else {
unsigned coeff = 0;
for (unsigned j = 0; j < p.num_watch(); ++j) {
unsigned coeff = 0, j = 0;
for (; j < p.size(); ++j) {
if (p[j].second == l) {
coeff = p[j].first;
break;
}
}
++j;
if (j < p.num_watch()) {
j = p.num_watch();
}
CTRACE("sat", coeff == 0, display(tout << l << " coeff: " << coeff << "\n", p, true););
if (_debug_conflict) {
@ -1829,9 +1833,9 @@ namespace sat {
SASSERT(coeff > 0);
unsigned slack = p.slack() - coeff;
for (unsigned i = p.num_watch(); i < p.size(); ++i) {
literal lit = p[i].second;
unsigned w = p[i].first;
for (; j < p.size(); ++j) {
literal lit = p[j].second;
unsigned w = p[j].first;
SASSERT(l_false == value(lit));
if (slack + w < k) {
slack += w;
@ -3094,7 +3098,7 @@ namespace sat {
}
for (wliteral l : p1) {
SASSERT(m_weights[l.second.index()] == 0);
m_weights[l.second.index()] = l.first;
m_weights.setx(l.second.index(), l.first, 0);
mark_visited(l.second);
}
for (unsigned i = 0; i < p1.num_watch(); ++i) {