mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

cube and clause

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-28 11:29:36 -07:00 • committed by Arie Gurfinkel
parent ea032b56c0
commit 005a6d93bb
6 changed files with 119 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/smt_clause.cpp
View file

@ -28,7 +28,7 @@ namespace smt {
clause * clause::mk(ast_manager & m, unsigned num_lits, literal * lits, clause_kind k, justification * js,
clause_del_eh * del_eh, bool save_atoms, expr * const * bool_var2expr_map) {
SASSERT(k == CLS_AUX || js == 0 || !js->in_region());
SASSERT(num_lits >= 2);
SASSERT(num_lits > 2);
unsigned sz = get_obj_size(num_lits, k, save_atoms, del_eh != nullptr, js != nullptr);
void * mem = m.get_allocator().allocate(sz);
clause * cls = new (mem) clause();

47
src/smt/smt_context.cpp
View file

@ -1815,7 +1815,7 @@ namespace smt {
*/
bool context::decide() {
if (m_clause && at_search_level()) {
if (at_search_level() && !m_clause_lits.empty()) {
switch (decide_clause()) {
case l_true: // already satisfied
break;
@ -3137,17 +3137,19 @@ namespace smt {
void context::init_clause(expr_ref_vector const& clause) {
if (m_clause) del_clause(m_clause);
m_clause = nullptr;
m_clause_lits.reset();
for (expr* lit : clause) {
internalize_formula(lit, true);
mark_as_relevant(lit);
m_clause_lits.push_back(get_literal(lit));
}
m_clause = mk_clause(m_clause_lits.size(), m_clause_lits.c_ptr(), nullptr);
if (m_clause_lits.size() > 2)
m_clause = clause::mk(m_manager, m_clause_lits.size(), m_clause_lits.c_ptr(), CLS_AUX);
}
lbool context::decide_clause() {
if (!m_clause) return l_true;
if (m_clause_lits.empty()) return l_true;
shuffle(m_clause_lits.size(), m_clause_lits.c_ptr(), m_random);
for (literal l : m_clause_lits) {
switch (get_assignment(l)) {
@ -3162,20 +3164,38 @@ namespace smt {
}
}
for (unsigned i = m_assigned_literals.size(); i-- > 0; ) {
literal lit = m_assigned_literals[i];
if (m_clause_lits.contains(~lit)) {
for (unsigned j = 0, sz = m_clause->get_num_literals(); j < sz; ++j) {
if (m_clause->get_literal(j) == ~lit) {
if (j > 0) m_clause->swap_lits(j, 0);
break;
literal nlit = ~m_assigned_literals[i];
if (m_clause_lits.contains(nlit)) {
switch (m_clause_lits.size()) {
case 1: {
b_justification js;
set_conflict(js, ~nlit);
break;
}
case 2: {
if (nlit == m_clause_lits[1]) {
std::swap(m_clause_lits[0], m_clause_lits[1]);
}
b_justification js(~m_clause_lits[1]);
set_conflict(js, ~nlit);
break;
}
b_justification js(m_clause);
set_conflict(js, ~lit);
return l_false;
default: {
for (unsigned j = 0, sz = m_clause->get_num_literals(); j < sz; ++j) {
if (m_clause->get_literal(j) == nlit) {
if (j > 0) m_clause->swap_lits(j, 0);
break;
}
}
b_justification js(m_clause);
set_conflict(js, ~nlit);
break;
}
}
break;
}
}
UNREACHABLE();
VERIFY(!resolve_conflict());
return l_false;
}
@ -3280,6 +3300,7 @@ namespace smt {
if (m_clause) del_clause(m_clause);
m_clause = nullptr;
m_clause_lits.reset();
m_unsat_core.reset();
m_stats.m_num_checks++;
pop_to_base_lvl();