mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-11 02:08:07 +00:00
Code Activity

n/a

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-07-05 14:32:13 -07:00
parent 5262248823
commit b419a0e4a4
4 changed files with 288 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/sat/sat_solver.cpp
View file

@ -1406,22 +1406,29 @@ namespace sat {
SASSERT(at_base_lvl());
m_cleaner();
CASSERT("sat_simplify_bug", check_invariant());
m_scc();
CASSERT("sat_simplify_bug", check_invariant());
m_ext->validate();
m_simplifier(false);
CASSERT("sat_simplify_bug", check_invariant());
CASSERT("sat_missed_prop", check_missed_propagation());
m_ext->validate();
if (!m_learned.empty()) {
m_simplifier(true);
CASSERT("sat_missed_prop", check_missed_propagation());
CASSERT("sat_simplify_bug", check_invariant());
}
m_ext->validate();
if (m_config.m_lookahead_simplify) {
{
lookahead lh(*this);
@ -1435,13 +1442,18 @@ namespace sat {
}
}
sort_watch_lits();
CASSERT("sat_simplify_bug", check_invariant());
m_ext->validate();
m_probing();
CASSERT("sat_missed_prop", check_missed_propagation());
CASSERT("sat_simplify_bug", check_invariant());
m_ext->validate();
m_asymm_branch();
CASSERT("sat_missed_prop", check_missed_propagation());
CASSERT("sat_simplify_bug", check_invariant());
@ -1900,9 +1912,7 @@ namespace sat {
*/
unsigned solver::psm(clause const & c) const {
unsigned r = 0;
unsigned sz = c.size();
for (unsigned i = 0; i < sz; i++) {
literal l = c[i];
for (literal l : c) {
if (l.sign()) {
if (m_phase[l.var()] == NEG_PHASE)
r++;