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

Merge branch 'master' of https://github.com/Z3Prover/z3 into csp

Browse source
This commit is contained in:
Nikolaj Bjorner 2018-10-21 12:26:53 -07:00
commit ccca063e54
254 changed files with 1194 additions and 1753 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/sat/sat_solver.cpp
View file

@ -1100,6 +1100,10 @@ namespace sat {
m_restart_threshold = m_config.m_restart_initial;
}
if (reached_max_conflicts()) {
return l_undef;
}
// iff3_finder(*this)();
simplify_problem();
if (check_inconsistent()) return l_false;
@ -1137,7 +1141,7 @@ namespace sat {
}
}
catch (abort_solver) {
catch (const abort_solver &) {
m_reason_unknown = "sat.giveup";
return l_undef;
}
@ -1712,17 +1716,6 @@ namespace sat {
#endif
}
unsigned solver::get_hash() const {
unsigned result = 0;
for (clause* cp : m_clauses) {
result = combine_hash(cp->size(), combine_hash(result, cp->id()));
}
for (clause* cp : m_learned) {
result = combine_hash(cp->size(), combine_hash(result, cp->id()));
}
return result;
}
bool solver::set_root(literal l, literal r) {
return !m_ext || m_ext->set_root(l, r);
}