mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-09 20:50:50 +00:00
Code Activity

fix lookahead code

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-06-04 11:55:53 -07:00
parent 181911463e
commit 71b6f97fb1
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -282,24 +282,25 @@ public:
virtual expr_ref lookahead(expr_ref_vector const& candidates) { virtual expr_ref lookahead(expr_ref_vector const& candidates) {
sat::bool_var_vector vars; sat::bool_var_vector vars;
u_map<expr*> var2candidate; expr_ref_vector lit2expr(m);
m_map.mk_inv(lit2expr);
for (auto c : candidates) { for (auto c : candidates) {
// TBD: check membership
sat::bool_var v = m_map.to_bool_var(c); sat::bool_var v = m_map.to_bool_var(c);
SASSERT(v != sat::null_bool_var); if (v != sat::null_bool_var) {
vars.push_back(v); vars.push_back(v);
var2candidate.insert(v, c); }
}
if (vars.empty()) {
return expr_ref(m.mk_true(), m);
} }
sat::literal l = m_solver.select_lookahead(vars); sat::literal l = m_solver.select_lookahead(vars);
if (m_solver.inconsistent()) {
return expr_ref(m.mk_false(), m);
}
if (l == sat::null_literal) { if (l == sat::null_literal) {
return expr_ref(m.mk_true(), m); return expr_ref(m.mk_true(), m);
} }
expr* e; return expr_ref(lit2expr[l.index()].get(), m);
if (!var2candidate.find(l.var(), e)) {
// TBD: if candidate set is empty, then do something else.
e = m.mk_true();
}
return expr_ref(l.sign() ? m.mk_not(e) : e, m);
} }
virtual lbool get_consequences_core(expr_ref_vector const& assumptions, expr_ref_vector const& vars, expr_ref_vector& conseq) { virtual lbool get_consequences_core(expr_ref_vector const& assumptions, expr_ref_vector const& vars, expr_ref_vector& conseq) {