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

init search before returning

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-06-11 13:08:05 -07:00
parent b266af3e08
commit af6ebbcd92
16 changed files with 90 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/sat/sat_solver.cpp
View file

@ -811,14 +811,9 @@ namespace sat {
return r;
}
literal solver::select_lookahead(bool_var_vector const& vars) {
literal solver::select_lookahead(literal_vector const& assumptions, bool_var_vector const& vars) {
lookahead lh(*this);
literal result = lh.select_lookahead(vars);
if (result == null_literal) {
set_conflict(justification());
}
// extract unit literals from lh
return result;
return lh.select_lookahead(assumptions, vars);
}
// -----------------------
@ -851,8 +846,8 @@ namespace sat {
}
#endif
try {
if (inconsistent()) return l_false;
init_search();
if (inconsistent()) return l_false;
propagate(false);
if (inconsistent()) return l_false;
init_assumptions(num_lits, lits);