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

updates with constraints

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2023-08-09 18:23:06 -07:00
parent 3fc8f7e5d0
commit 942571d5a4
2 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/sat/smt/synth_solver.cpp
View file

@ -33,7 +33,7 @@ namespace synth {
bool solver::contains_uncomputable(expr* e) { bool solver::contains_uncomputable(expr* e) {
auto is_output = [&](expr* e) { auto is_output = [&](expr* e) {
return any_of(m_synth, [&](app* a) { return a->get_arg(0) == e; }); return any_of(m_synth, [&](app* a) { return synth_output(a) == e; });
}; };
return any_of(subterms::all(expr_ref(e, m)), [&](expr* a) { return (is_app(a) && m_uncomputable.contains(to_app(a)->get_decl())) || is_output(a); }); return any_of(subterms::all(expr_ref(e, m)), [&](expr* a) { return (is_app(a) && m_uncomputable.contains(to_app(a)->get_decl())) || is_output(a); });
} }
@ -48,7 +48,7 @@ namespace synth {
return sat::null_literal; return sat::null_literal;
IF_VERBOSE(0, verbose_stream() << sol << "\n"); IF_VERBOSE(0, verbose_stream() << sol << "\n");
return eq_internalize(e->get_arg(0), sol); return eq_internalize(synth_output(e), sol);
} }
// block current model using realizer by E-graph (and arithmetic) // block current model using realizer by E-graph (and arithmetic)
@ -89,10 +89,13 @@ namespace synth {
// This assumes that each (assert (constraint (...)) is asserting exactly one app // This assumes that each (assert (constraint (...)) is asserting exactly one app
SASSERT((e->get_num_args() == 1) && (is_app(e->get_arg(0)))); SASSERT((e->get_num_args() == 1) && (is_app(e->get_arg(0))));
app* arg = to_app(e->get_arg(0)); app* arg = to_app(e->get_arg(0));
internalize(arg); sat::literal lit = ctx.mk_literal(arg);
sat::bool_var bv = ctx.get_si().add_bool_var(e);
sat::literal lit_e(bv, false);
ctx.attach_lit(lit_e, e);
add_clause(~lit_e, lit);
m_spec.insert(arg); m_spec.insert(arg);
ctx.push(insert_obj_trail(m_spec, arg)); ctx.push(insert_obj_trail(m_spec, arg));
// TODO: assert arg <=> e
} }
// recognize synthesis objectives here. // recognize synthesis objectives here.
@ -169,33 +172,39 @@ namespace synth {
} }
} }
if (m_blockers.size() > m_blockers_qhead) if (m_is_solved)
return; return;
for (app* e : m_synth) { for (app* e : m_synth) {
// TODO: actually wait to call compute_solution until unit propagation! euf::enode* n = expr2enode(synth_output(e));
euf::enode* n = expr2enode(e->get_arg(0)); if (is_computable(n) && !m_solved.contains(e))
if (is_computable(n)) { ctx.push_vec(m_solved, e);
expr_ref sol = compute_solution(e);
IF_VERBOSE(0, verbose_stream() << "solution " << sol << "\n");
ctx.push_vec(m_blockers, ~eq_internalize(sol, n->get_expr()));
}
} }
} }
bool solver::unit_propagate() { bool solver::unit_propagate() {
if (m_blockers_qhead >= m_blockers.size()) if (m_is_solved)
return false; return false;
IF_VERBOSE(2, verbose_stream() << "propagate " << m_blockers_qhead << " " << m_blockers << "\n"); if (m_solved.size() < m_synth.size())
ctx.push(value_trail(m_blockers_qhead)); return false;
while (m_blockers_qhead++ < m_blockers.size()) IF_VERBOSE(2, verbose_stream() << "propagate\n");
add_unit(m_blockers[m_blockers_qhead-1]); ctx.push(value_trail(m_is_solved));
m_is_solved = true;
sat::literal_vector clause;
for (app* e : m_synth) {
auto lit = synthesize(e);
if (lit == sat::null_literal)
return false;
clause.push_back(~lit);
}
add_clause(clause);
return true; return true;
} }
expr_ref solver::compute_solution(app* e) { expr_ref solver::compute_solution(app* e) {
auto * n = expr2enode(e->get_arg(0)); auto * n = expr2enode(synth_output(e));
expr_ref_vector repr(m); expr_ref_vector repr(m);
auto get_rep = [&](euf::enode* n) { return repr.get(n->get_root_id(), nullptr); }; auto get_rep = [&](euf::enode* n) { return repr.get(n->get_root_id(), nullptr); };
auto has_rep = [&](euf::enode* n) { return !!get_rep(n); }; auto has_rep = [&](euf::enode* n) { return !!get_rep(n); };
auto set_rep = [&](euf::enode* n, expr* e) { repr.setx(n->get_root_id(), e); }; auto set_rep = [&](euf::enode* n, expr* e) { repr.setx(n->get_root_id(), e); };

7
src/sat/smt/synth_solver.h
View file

@ -48,9 +48,12 @@ namespace synth {
void on_merge_eh(euf::enode* root, euf::enode* other); void on_merge_eh(euf::enode* root, euf::enode* other);
expr_ref compute_solution(app* synth_objective); expr_ref compute_solution(app* synth_objective);
expr* synth_output(expr* e) const { return to_app(e)->get_arg(0); }
bool_vector m_is_computable; bool_vector m_is_computable;
unsigned m_blockers_qhead = 0; bool m_is_solved = false;
sat::literal_vector m_blockers; ptr_vector<app> m_solved;
ptr_vector<app> m_synth; ptr_vector<app> m_synth;
typedef obj_hashtable<func_decl> func_decl_set; typedef obj_hashtable<func_decl> func_decl_set;