mirror of
https://github.com/Z3Prover/z3
synced 2025-04-13 20:38:43 +00:00
remove empty clause feature
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
c839f58276
commit
ec39d84f57
|
@ -75,7 +75,6 @@ namespace smt {
|
|||
m_phase_default(false),
|
||||
m_conflict(null_b_justification),
|
||||
m_not_l(null_literal),
|
||||
m_empty_clause(false),
|
||||
m_conflict_resolution(mk_conflict_resolution(m, *this, m_dyn_ack_manager, p, m_assigned_literals, m_watches)),
|
||||
m_unsat_proof(m),
|
||||
m_dyn_ack_manager(*this, p),
|
||||
|
@ -2396,11 +2395,9 @@ namespace smt {
|
|||
m_unsat_proof = nullptr;
|
||||
}
|
||||
m_base_scopes.shrink(new_lvl);
|
||||
m_empty_clause = false;
|
||||
}
|
||||
else {
|
||||
m_conflict = m_empty_clause ? b_justification::mk_axiom() : null_b_justification;
|
||||
// m_conflict = null_b_justification;
|
||||
m_conflict = null_b_justification;
|
||||
m_not_l = null_literal;
|
||||
}
|
||||
del_clauses(m_aux_clauses, s.m_aux_clauses_lim);
|
||||
|
|
|
@ -193,7 +193,6 @@ namespace smt {
|
|||
// levels survives to the base level.
|
||||
b_justification m_conflict;
|
||||
literal m_not_l;
|
||||
bool m_empty_clause;
|
||||
scoped_ptr<conflict_resolution> m_conflict_resolution;
|
||||
proof_ref m_unsat_proof;
|
||||
|
||||
|
|
|
@ -1351,7 +1351,6 @@ namespace smt {
|
|||
m_justifications.push_back(j);
|
||||
TRACE("mk_clause", tout << "empty clause... setting conflict\n";);
|
||||
set_conflict(j == nullptr ? b_justification::mk_axiom() : b_justification(j));
|
||||
m_empty_clause = (j == nullptr);
|
||||
SASSERT(inconsistent());
|
||||
return nullptr;
|
||||
case 1:
|
||||
|
|
Loading…
Reference in a new issue