mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-19 04:13:38 +00:00
Code Activity

updates

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-02-07 18:04:24 -08:00
parent b6b6035cfb
commit eaf845c2f4
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/sat/card_extension.cpp
View file

@ -120,9 +120,8 @@ namespace sat {
return; return;
} }
ptr_vector<card>*& cards = m_var_infos[lit.var()].m_lit_watch[lit.sign()]; ptr_vector<card>*& cards = m_var_infos[lit.var()].m_lit_watch[lit.sign()];
if (cards) { if (!is_tag_empty(cards)) {
if (remove(*cards, c)) { if (remove(*cards, c)) {
std::cout << "Empty: " << cards->empty() << "\n";
cards = set_tag_empty(cards); cards = set_tag_empty(cards);
} }
} }
@ -291,6 +290,7 @@ namespace sat {
unsigned num_steps = 0; unsigned num_steps = 0;
DEBUG_CODE(active2pb(m_A);); DEBUG_CODE(active2pb(m_A););
std::cout << m_num_marks << "\n";
do { do {
if (offset == 0) { if (offset == 0) {
@ -298,6 +298,7 @@ namespace sat {
} }
// TBD: need proper check for overflow. // TBD: need proper check for overflow.
if (offset > (1 << 12)) { if (offset > (1 << 12)) {
std::cout << "Offset: " << offset << "\n";
goto bail_out; goto bail_out;
} }
@ -386,6 +387,9 @@ namespace sat {
consequent = lits[idx]; consequent = lits[idx];
v = consequent.var(); v = consequent.var();
if (s().is_marked(v)) break; if (s().is_marked(v)) break;
if (idx == 0) {
goto bail_out;
}
SASSERT(idx > 0); SASSERT(idx > 0);
--idx; --idx;
} }
@ -481,7 +485,8 @@ namespace sat {
return true; return true;
bail_out: bail_out:
while (m_num_marks > 0 && idx > 0) { std::cout << "bail num marks: " << m_num_marks << " idx: " << idx << "\n";
while (m_num_marks > 0 && idx >= 0) {
bool_var v = lits[idx].var(); bool_var v = lits[idx].var();
if (s().is_marked(v)) { if (s().is_marked(v)) {
s().reset_mark(v); s().reset_mark(v);

1
src/sat/sat_solver.cpp
View file

@ -371,6 +371,7 @@ namespace sat {
if (m_watches.size() <= (~c[1]).index()) std::cout << c << "\n"; if (m_watches.size() <= (~c[1]).index()) std::cout << c << "\n";
if (m_watches[(~c[0]).index()].size() >= 20000) { if (m_watches[(~c[0]).index()].size() >= 20000) {
std::cout << m_par_id << ": " << c << "\n"; std::cout << m_par_id << ": " << c << "\n";
enable_trace("sat");
} }
m_watches[(~c[0]).index()].push_back(watched(block_lit, cls_off)); m_watches[(~c[0]).index()].push_back(watched(block_lit, cls_off));
m_watches[(~c[1]).index()].push_back(watched(block_lit, cls_off)); m_watches[(~c[1]).index()].push_back(watched(block_lit, cls_off));