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

updates

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-10-13 11:22:47 -07:00
parent 708e8669fa
commit 4d48811efd
3 changed files with 54 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/sat/ba_solver.cpp
View file

@ -1288,7 +1288,6 @@ namespace sat {
if (!create_asserting_lemma()) {
goto bail_out;
}
active2card();
DEBUG_CODE(VERIFY(validate_conflict(m_lemma, m_A)););
@ -1347,6 +1346,7 @@ namespace sat {
}
bool ba_solver::create_asserting_lemma() {
bool adjusted = false;
adjust_conflict_level:
int64 bound64 = m_bound;
@ -1354,7 +1354,6 @@ namespace sat {
for (bool_var v : m_active_vars) {
slack += get_abs_coeff(v);
}
m_lemma.reset();
m_lemma.push_back(null_literal);
unsigned num_skipped = 0;
@ -1389,26 +1388,32 @@ namespace sat {
}
}
}
if (slack >= 0) {
IF_VERBOSE(20, verbose_stream() << "(sat.card slack: " << slack << " skipped: " << num_skipped << ")\n";);
return false;
}
if (m_overflow) {
return false;
}
if (m_lemma[0] == null_literal) {
if (m_lemma.size() == 1) {
s().set_conflict(justification());
return false;
}
return false;
unsigned old_level = m_conflict_lvl;
m_conflict_lvl = 0;
for (unsigned i = 1; i < m_lemma.size(); ++i) {
m_conflict_lvl = std::max(m_conflict_lvl, lvl(m_lemma[i]));
}
IF_VERBOSE(10, verbose_stream() << "(sat.backjump :new-level " << m_conflict_lvl << " :old-level " << old_level << ")\n";);
IF_VERBOSE(1, verbose_stream() << "(sat.backjump :new-level " << m_conflict_lvl << " :old-level " << old_level << ")\n";);
adjusted = true;
goto adjust_conflict_level;
}
return !m_overflow;
if (!adjusted) {
active2card();
}
return true;
}
/*

2
src/sat/tactic/goal2sat.cpp
View file

@ -1153,6 +1153,8 @@ struct sat2goal::imp {
}
}
}
//s.display(std::cout);
//r.display(std::cout);
}
void add_clause(sat::literal_vector const& lits, expr_ref_vector& lemmas) {