mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-07 03:31:23 +00:00
Code Activity

bug fixes, prepare for retaining blocked clauses

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-10-19 22:19:05 -07:00
parent 636f740b1a
commit 76eed064eb
16 changed files with 333 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/sat/sat_clause_use_list.h
View file

@ -24,30 +24,30 @@ Revision History:
namespace sat {
#define LAZY_USE_LIST
/**
\brief Clause use list with delayed deletion.
*/
class clause_use_list {
clause_vector m_clauses;
#ifdef LAZY_USE_LIST
unsigned m_size;
#endif
unsigned m_num_blocked;
public:
clause_use_list() {
STRACE("clause_use_list_bug", tout << "[cul_created] " << this << "\n";);
#ifdef LAZY_USE_LIST
m_size = 0;
#endif
m_num_blocked = 0;
}
unsigned size() const {
#ifdef LAZY_USE_LIST
return m_size;
#else
return m_clauses.size();
#endif
}
unsigned num_blocked() const {
return m_num_blocked;
}
unsigned non_blocked_size() const {
return m_size - m_num_blocked;
}
bool empty() const { return size() == 0; }
@ -57,58 +57,59 @@ namespace sat {
SASSERT(!m_clauses.contains(&c));
SASSERT(!c.was_removed());
m_clauses.push_back(&c);
#ifdef LAZY_USE_LIST
m_size++;
#endif
if (c.is_blocked()) ++m_num_blocked;
}
void erase_not_removed(clause & c) {
STRACE("clause_use_list_bug", tout << "[cul_erase_not_removed] " << this << " " << &c << "\n";);
#ifdef LAZY_USE_LIST
SASSERT(m_clauses.contains(&c));
SASSERT(!c.was_removed());
m_clauses.erase(&c);
m_size--;
#else
m_clauses.erase(&c);
#endif
if (c.is_blocked()) --m_num_blocked;
}
void erase(clause & c) {
STRACE("clause_use_list_bug", tout << "[cul_erase] " << this << " " << &c << "\n";);
#ifdef LAZY_USE_LIST
SASSERT(m_clauses.contains(&c));
SASSERT(c.was_removed());
m_size--;
#else
m_clauses.erase(&c);
#endif
if (c.is_blocked()) --m_num_blocked;
}
void block(clause const& c) {
SASSERT(c.is_blocked());
++m_num_blocked;
SASSERT(check_invariant());
}
void unblock(clause const& c) {
SASSERT(!c.is_blocked());
--m_num_blocked;
SASSERT(check_invariant());
}
void reset() {
m_clauses.finalize();
#ifdef LAZY_USE_LIST
m_size = 0;
#endif
m_num_blocked = 0;
}
bool check_invariant() const;
// iterate & compress
class iterator {
class iterator {
clause_vector & m_clauses;
unsigned m_size;
unsigned m_i;
#ifdef LAZY_USE_LIST
unsigned m_j;
void consume();
#endif
public:
iterator(clause_vector & v):m_clauses(v), m_size(v.size()), m_i(0) {
#ifdef LAZY_USE_LIST
m_j = 0;
consume();
#endif
}
~iterator();
bool at_end() const { return m_i == m_size; }
@ -117,10 +118,8 @@ namespace sat {
SASSERT(!at_end());
SASSERT(!m_clauses[m_i]->was_removed());
m_i++;
#ifdef LAZY_USE_LIST
m_j++;
consume();
#endif
}
};