mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

allowing non-literal assumptions

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-23 15:01:00 -07:00
parent 6f2cd4817b
commit 49faaaa8f1
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,13 +130,36 @@ public:
m_solver.display_wcnf(out, m_asms.size(), m_asms.c_ptr(), nweights.c_ptr()); m_solver.display_wcnf(out, m_asms.size(), m_asms.c_ptr(), nweights.c_ptr());
} }
bool is_literal(expr* e) const {
return
is_uninterp_const(e) ||
(m.is_not(e, e) && is_uninterp_const(e));
}
virtual lbool check_sat(unsigned sz, expr * const * assumptions) { virtual lbool check_sat(unsigned sz, expr * const * assumptions) {
m_solver.pop_to_base_level(); m_solver.pop_to_base_level();
expr_ref_vector _assumptions(m);
obj_map<expr, expr*> asm2fml;
for (unsigned i = 0; i < sz; ++i) {
if (!is_literal(assumptions[i])) {
expr_ref a(m.mk_fresh_const("s", m.mk_bool_sort()), m);
expr_ref fml(m.mk_eq(a, assumptions[i]), m);
assert_expr(fml);
_assumptions.push_back(a);
asm2fml.insert(a, assumptions[i]);
}
else {
_assumptions.push_back(assumptions[i]);
asm2fml.insert(assumptions[i], assumptions[i]);
}
}
TRACE("sat", tout << _assumptions << "\n";);
dep2asm_t dep2asm; dep2asm_t dep2asm;
m_model = 0; m_model = 0;
lbool r = internalize_formulas(); lbool r = internalize_formulas();
if (r != l_true) return r; if (r != l_true) return r;
r = internalize_assumptions(sz, assumptions, dep2asm); r = internalize_assumptions(sz, _assumptions.c_ptr(), dep2asm);
if (r != l_true) return r; if (r != l_true) return r;
r = m_solver.check(m_asms.size(), m_asms.c_ptr()); r = m_solver.check(m_asms.size(), m_asms.c_ptr());
@ -150,7 +173,7 @@ public:
case l_false: case l_false:
// TBD: expr_dependency core is not accounted for. // TBD: expr_dependency core is not accounted for.
if (!m_asms.empty()) { if (!m_asms.empty()) {
extract_core(dep2asm); extract_core(dep2asm, asm2fml);
} }
break; break;
default: default:
@ -241,6 +264,7 @@ public:
sat::bool_var_vector bvars; sat::bool_var_vector bvars;
vector<sat::literal_vector> lconseq; vector<sat::literal_vector> lconseq;
dep2asm_t dep2asm; dep2asm_t dep2asm;
obj_map<expr, expr*> asm2fml;
m_solver.pop_to_base_level(); m_solver.pop_to_base_level();
lbool r = internalize_formulas(); lbool r = internalize_formulas();
if (r != l_true) return r; if (r != l_true) return r;
@ -251,7 +275,7 @@ public:
r = m_solver.get_consequences(m_asms, bvars, lconseq); r = m_solver.get_consequences(m_asms, bvars, lconseq);
if (r == l_false) { if (r == l_false) {
if (!m_asms.empty()) { if (!m_asms.empty()) {
extract_core(dep2asm); extract_core(dep2asm, asm2fml);
} }
return r; return r;
} }
@ -569,7 +593,7 @@ private:
} }
} }
void extract_core(dep2asm_t& dep2asm) { void extract_core(dep2asm_t& dep2asm, obj_map<expr, expr*> const& asm2fml) {
u_map<expr*> asm2dep; u_map<expr*> asm2dep;
extract_asm2dep(dep2asm, asm2dep); extract_asm2dep(dep2asm, asm2dep);
sat::literal_vector const& core = m_solver.get_core(); sat::literal_vector const& core = m_solver.get_core();
@ -590,6 +614,9 @@ private:
for (unsigned i = 0; i < core.size(); ++i) { for (unsigned i = 0; i < core.size(); ++i) {
expr* e = 0; expr* e = 0;
VERIFY(asm2dep.find(core[i].index(), e)); VERIFY(asm2dep.find(core[i].index(), e));
if (asm2fml.contains(e)) {
e = asm2fml.find(e);
}
m_core.push_back(e); m_core.push_back(e);
} }
} }

2
src/smt/theory_lra.cpp
View file

@ -487,7 +487,7 @@ namespace smt {
result = m_theory_var2var_index[v]; result = m_theory_var2var_index[v];
} }
if (result == UINT_MAX) { if (result == UINT_MAX) {
result = m_solver->add_var(v); result = m_solver->add_var(v); // TBD: is_int(v);
m_theory_var2var_index.setx(v, result, UINT_MAX); m_theory_var2var_index.setx(v, result, UINT_MAX);
m_var_index2theory_var.setx(result, v, UINT_MAX); m_var_index2theory_var.setx(result, v, UINT_MAX);
m_var_trail.push_back(v); m_var_trail.push_back(v);