mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

add a way to use new smt core for selected logics

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-09-14 10:43:52 -07:00
parent 73ce5c5fc8
commit 2328a6e839
8 changed files with 88 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/sat/sat_solver.cpp
View file

@ -995,6 +995,7 @@ namespace sat {
literal l, not_l, l1, l2;
lbool val1, val2;
bool keep;
prop_again:
while (m_qhead < m_trail.size()) {
checkpoint();
m_cleaner.dec();
@ -1163,11 +1164,13 @@ namespace sat {
}
}
wlist.set_end(it2);
if (m_ext) {
m_ext->unit_propagate();
if (inconsistent())
return false;
}
}
if (m_ext) {
m_ext->unit_propagate();
if (inconsistent())
return false;
if (m_qhead < m_trail.size())
goto prop_again;
}
SASSERT(m_qhead == m_trail.size());
SASSERT(!m_inconsistent);
@ -2665,7 +2668,7 @@ namespace sat {
// at the backtracking level. This is the case where the external theories miss propagations
// that only get triggered after decisions.
if (unique_max && !m_force_conflict_analysis) {
if (allow_backtracking() && unique_max && !m_force_conflict_analysis) {
TRACE("sat", tout << "unique max " << js << " " << m_not_l << "\n";);
pop_reinit(m_scope_lvl - m_conflict_lvl + 1);
m_force_conflict_analysis = true;
@ -2748,6 +2751,14 @@ namespace sat {
fill_ext_antecedents(consequent, js, false);
for (literal l : m_ext_antecedents)
process_antecedent(l, num_marks);
#if 0
if (m_ext_antecedents.size() <= 1) {
for (literal& l : m_ext_antecedents)
l.neg();
m_ext_antecedents.push_back(consequent);
mk_clause(m_ext_antecedents.size(), m_ext_antecedents.c_ptr(), sat::status::redundant());
}
#endif
break;
}
default:
@ -2852,11 +2863,14 @@ namespace sat {
updt_phase_counters();
}
bool solver::use_backjumping(unsigned num_scopes) {
bool solver::use_backjumping(unsigned num_scopes) const {
return
num_scopes > 0 &&
(num_scopes <= m_config.m_backtrack_scopes ||
m_conflicts_since_init <= m_config.m_backtrack_init_conflicts);
(num_scopes <= m_config.m_backtrack_scopes || !allow_backtracking());
}
bool solver::allow_backtracking() const {
return m_conflicts_since_init > m_config.m_backtrack_init_conflicts;
}
void solver::process_antecedent_for_unsat_core(literal antecedent) {

3
src/sat/sat_solver.h
View file

@ -574,7 +574,8 @@ namespace sat {
unsigned m_conflict_lvl;
literal_vector m_lemma;
literal_vector m_ext_antecedents;
bool use_backjumping(unsigned num_scopes);
bool use_backjumping(unsigned num_scopes) const;
bool allow_backtracking() const;
bool resolve_conflict();
lbool resolve_conflict_core();
void learn_lemma_and_backjump();