mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 06:03:23 +00:00
Code Activity

fix consequence tracking for negated assumptions

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-07-30 10:49:06 -07:00
parent 7d545d902d
commit d32019f4c9
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/python/z3.py
View file

@ -6134,7 +6134,7 @@ class Solver(Z3PPObject):
>>> s.consequences([a],[b,c,d]) >>> s.consequences([a],[b,c,d])
(sat, [Implies(a, b), Implies(a, c)]) (sat, [Implies(a, b), Implies(a, c)])
>>> s.consequences([Not(c),d],[a,b,c,d]) >>> s.consequences([Not(c),d],[a,b,c,d])
(sat, [Implies(Not(c), Not(a)), Implies(Not(c), Not(b)), Implies(True, Not(c)), Implies(True, d)]) (sat, [Implies(Not(c), Not(c)), Implies(d, d), Implies(Not(c), Not(b)), Implies(Not(c), Not(a))])
""" """
if isinstance(assumptions, list): if isinstance(assumptions, list):
_asms = AstVector(None, self.ctx) _asms = AstVector(None, self.ctx)

11
src/smt/smt_consequences.cpp
View file

@ -31,7 +31,7 @@ namespace smt {
return mk_and(premises); return mk_and(premises);
} }
void context::extract_fixed_consequences(unsigned start, obj_map<expr, expr*>& vars, obj_hashtable<expr> const& assumptions, expr_ref_vector& conseq) { void context::extract_fixed_consequences(unsigned start, obj_map<expr, expr*>& vars, uint_set const& assumptions, expr_ref_vector& conseq) {
ast_manager& m = m_manager; ast_manager& m = m_manager;
pop_to_search_lvl(); pop_to_search_lvl();
literal_vector const& lits = assigned_literals(); literal_vector const& lits = assigned_literals();
@ -43,8 +43,8 @@ namespace smt {
if (lit == true_literal) continue; if (lit == true_literal) continue;
expr* e = bool_var2expr(lit.var()); expr* e = bool_var2expr(lit.var());
uint_set s; uint_set s;
if (assumptions.contains(e)) { if (assumptions.contains(lit.var())) {
s.insert(get_literal(e).var()); s.insert(lit.var());
} }
else { else {
b_justification js = get_justification(lit.var()); b_justification js = get_justification(lit.var());
@ -78,6 +78,7 @@ namespace smt {
} }
} }
m_antecedents.insert(lit.var(), s); m_antecedents.insert(lit.var(), s);
TRACE("context", display_literal_verbose(tout, lit); tout << " " << s << "\n";);
bool found = false; bool found = false;
if (vars.contains(e)) { if (vars.contains(e)) {
found = true; found = true;
@ -110,9 +111,9 @@ namespace smt {
return is_sat; return is_sat;
} }
obj_map<expr, expr*> var2val; obj_map<expr, expr*> var2val;
obj_hashtable<expr> _assumptions; uint_set _assumptions;
for (unsigned i = 0; i < assumptions.size(); ++i) { for (unsigned i = 0; i < assumptions.size(); ++i) {
_assumptions.insert(assumptions[i]); _assumptions.insert(get_literal(assumptions[i]).var());
} }
model_ref mdl; model_ref mdl;
get_model(mdl); get_model(mdl);

2
src/smt/smt_context.h
View file

@ -1345,7 +1345,7 @@ namespace smt {
vector<bool_var> b2v, ast_translation& tr); vector<bool_var> b2v, ast_translation& tr);
u_map<uint_set> m_antecedents; u_map<uint_set> m_antecedents;
void extract_fixed_consequences(unsigned idx, obj_map<expr, expr*>& vars, obj_hashtable<expr> const& assumptions, expr_ref_vector& conseq); void extract_fixed_consequences(unsigned idx, obj_map<expr, expr*>& vars, uint_set const& assumptions, expr_ref_vector& conseq);
expr_ref antecedent2fml(uint_set const& ante); expr_ref antecedent2fml(uint_set const& ante);