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

fix #3198

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-08 14:03:46 +01:00
parent f0451b68f3
commit 44104a5cce
5 changed files with 24 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/smt/smt_model_finder.cpp
View file

@ -3178,9 +3178,13 @@ namespace smt {
throw tactic_exception(m_context->get_manager().limit().get_cancel_msg());
}
mf::quantifier_info * model_finder::get_quantifier_info(quantifier * q) const {
TRACE("model_finder", tout << q->get_id() << ": " << q << " " << &m_q2info << " " << mk_pp(q, m) << "\n";);
return m_q2info[q];
mf::quantifier_info * model_finder::get_quantifier_info(quantifier * q) {
mf::quantifier_info* qi = nullptr;
if (!m_q2info.find(q, qi)) {
register_quantifier(q);
qi = m_q2info[q];
}
return qi;
}
void model_finder::set_context(context * ctx) {
@ -3265,7 +3269,7 @@ namespace smt {
for (quantifier * q : qs) {
quantifier_info * qi = get_quantifier_info(q);
quantifier * fq = qi->get_flat_q();
tout << "#" << fq->get_id() << " ->\n" << mk_pp(fq, m) << "\n";
tout << "#" << fq->get_id() << " ->\n" << mk_pp(fq, m) << "\n";
}
m_auf_solver->display_nodes(tout););
}
@ -3323,9 +3327,8 @@ namespace smt {
process_auf(qs, m);
}
quantifier * model_finder::get_flat_quantifier(quantifier * q) const {
quantifier * model_finder::get_flat_quantifier(quantifier * q) {
quantifier_info * qinfo = get_quantifier_info(q);
SASSERT(qinfo);
return qinfo->get_flat_q();
}
@ -3334,7 +3337,7 @@ namespace smt {
\remark q is the quantifier before flattening.
*/
mf::instantiation_set const * model_finder::get_uvar_inst_set(quantifier * q, unsigned i) const {
mf::instantiation_set const * model_finder::get_uvar_inst_set(quantifier * q, unsigned i) {
quantifier * flat_q = get_flat_quantifier(q);
SASSERT(flat_q->get_num_decls() >= q->get_num_decls());
instantiation_set const * r = m_auf_solver->get_uvar_inst_set(flat_q, flat_q->get_num_decls() - q->get_num_decls() + i);
@ -3346,8 +3349,7 @@ namespace smt {
// it must have been satisfied by "macro"/"hint".
quantifier_info * qinfo = get_quantifier_info(q);
SASSERT(qinfo);
SASSERT(qinfo->get_the_one() != nullptr);
return qinfo->get_macro_based_inst_set(i, m_context, *(m_auf_solver.get()));
return qinfo->get_macro_based_inst_set(i, m_context, *(m_auf_solver.get()));
}
/**
@ -3357,7 +3359,7 @@ namespace smt {
Store in generation the generation of the result
*/
expr * model_finder::get_inv(quantifier * q, unsigned i, expr * val, unsigned & generation) const {
expr * model_finder::get_inv(quantifier * q, unsigned i, expr * val, unsigned & generation) {
instantiation_set const * s = get_uvar_inst_set(q, i);
if (s == nullptr)
return nullptr;