mirror of
https://github.com/Z3Prover/z3
synced 2025-07-31 16:33:18 +00:00
debugging mc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner
parent
c7ee532173
commit
e4f29a7b8a
38 changed files with 143 additions and 123 deletions
|
|
@ -81,9 +81,10 @@ public:
|
|||
for (func_decl* f : m_bv_fns) result->m_bv_fns.push_back(tr(f));
|
||||
for (func_decl* f : m_int_fns) result->m_int_fns.push_back(tr(f));
|
||||
for (bound_manager* b : m_bounds) result->m_bounds.push_back(b->translate(dst_m));
|
||||
if (mc0()) {
|
||||
model_converter_ref mc = external_model_converter();
|
||||
if (mc) {
|
||||
ast_translation tr(m, dst_m);
|
||||
result->set_model_converter(mc0()->translate(tr));
|
||||
result->set_model_converter(mc->translate(tr));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -151,11 +152,36 @@ public:
|
|||
virtual void get_model_core(model_ref & mdl) {
|
||||
m_solver->get_model(mdl);
|
||||
if (mdl) {
|
||||
extend_model(mdl);
|
||||
filter_model(mdl);
|
||||
model_converter_ref mc = bounded_model_converter();
|
||||
if (mc) (*mc)(mdl);
|
||||
}
|
||||
}
|
||||
virtual model_converter_ref get_model_converter() const { return m_solver->get_model_converter(); }
|
||||
model_converter* external_model_converter() const {
|
||||
return concat(mc0(), bounded_model_converter());
|
||||
}
|
||||
model_converter* bounded_model_converter() const {
|
||||
if (m_int2bv.empty() && m_bv_fns.empty()) return nullptr;
|
||||
generic_model_converter* mc = alloc(generic_model_converter, m, "bounded_int2bv");
|
||||
for (func_decl* f : m_bv_fns)
|
||||
mc->hide(f);
|
||||
for (auto const& kv : m_int2bv) {
|
||||
rational offset;
|
||||
VERIFY (m_bv2offset.find(kv.m_value, offset));
|
||||
expr_ref value(m_bv.mk_bv2int(m.mk_const(kv.m_value)), m);
|
||||
if (!offset.is_zero()) {
|
||||
value = m_arith.mk_add(value, m_arith.mk_numeral(offset, true));
|
||||
}
|
||||
TRACE("int2bv", tout << mk_pp(kv.m_key, m) << " " << value << "\n";);
|
||||
mc->add(kv.m_key, value);
|
||||
}
|
||||
return mc;
|
||||
}
|
||||
|
||||
virtual model_converter_ref get_model_converter() const {
|
||||
model_converter_ref mc = concat(mc0(), bounded_model_converter());
|
||||
mc = concat(mc.get(), m_solver->get_model_converter().get());
|
||||
return mc;
|
||||
}
|
||||
virtual proof * get_proof() { return m_solver->get_proof(); }
|
||||
virtual std::string reason_unknown() const { return m_solver->reason_unknown(); }
|
||||
virtual void set_reason_unknown(char const* msg) { m_solver->set_reason_unknown(msg); }
|
||||
|
|
@ -198,35 +224,10 @@ public:
|
|||
}
|
||||
}
|
||||
return r;
|
||||
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
void filter_model(model_ref& mdl) const {
|
||||
if (m_bv_fns.empty()) {
|
||||
return;
|
||||
}
|
||||
generic_model_converter filter(m);
|
||||
for (func_decl* f : m_bv_fns) filter.hide(f);
|
||||
filter(mdl);
|
||||
}
|
||||
|
||||
void extend_model(model_ref& mdl) {
|
||||
generic_model_converter ext(m);
|
||||
for (auto const& kv : m_int2bv) {
|
||||
rational offset;
|
||||
VERIFY (m_bv2offset.find(kv.m_value, offset));
|
||||
expr_ref value(m_bv.mk_bv2int(m.mk_const(kv.m_value)), m);
|
||||
if (!offset.is_zero()) {
|
||||
value = m_arith.mk_add(value, m_arith.mk_numeral(offset, true));
|
||||
}
|
||||
TRACE("int2bv", tout << mk_pp(kv.m_key, m) << " " << value << "\n";);
|
||||
ext.add(kv.m_key, value);
|
||||
}
|
||||
ext(mdl);
|
||||
}
|
||||
|
||||
void accumulate_sub(expr_safe_replace& sub) const {
|
||||
for (unsigned i = 0; i < m_bounds.size(); ++i) {
|
||||
accumulate_sub(sub, *m_bounds[i]);
|
||||
|
|
|
|||
|
|
@ -50,9 +50,10 @@ public:
|
|||
|
||||
virtual solver* translate(ast_manager& dst_m, params_ref const& p) {
|
||||
solver* result = alloc(enum2bv_solver, dst_m, p, m_solver->translate(dst_m, p));
|
||||
if (mc0()) {
|
||||
model_converter_ref mc = external_model_converter();
|
||||
if (mc) {
|
||||
ast_translation tr(m, dst_m);
|
||||
result->set_model_converter(mc0()->translate(tr));
|
||||
result->set_model_converter(mc->translate(tr));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -91,18 +92,43 @@ public:
|
|||
virtual void get_model_core(model_ref & mdl) {
|
||||
m_solver->get_model(mdl);
|
||||
if (mdl) {
|
||||
extend_model(mdl);
|
||||
filter_model(mdl);
|
||||
model_converter_ref mc = enum_model_converter();
|
||||
if (mc) (*mc)(mdl);
|
||||
}
|
||||
}
|
||||
virtual model_converter_ref get_model_converter() const { return m_solver->get_model_converter(); }
|
||||
model_converter* enum_model_converter() const {
|
||||
if (m_rewriter.enum2def().empty() &&
|
||||
m_rewriter.enum2bv().empty()) {
|
||||
return nullptr;
|
||||
}
|
||||
generic_model_converter* mc = alloc(generic_model_converter, m, "enum2bv");
|
||||
for (auto const& kv : m_rewriter.enum2bv())
|
||||
mc->hide(kv.m_value);
|
||||
for (auto const& kv : m_rewriter.enum2def())
|
||||
mc->add(kv.m_key, kv.m_value);
|
||||
return mc;
|
||||
}
|
||||
|
||||
model_converter* external_model_converter() const {
|
||||
return concat(mc0(), enum_model_converter());
|
||||
}
|
||||
|
||||
virtual model_converter_ref get_model_converter() const {
|
||||
model_converter_ref mc = external_model_converter();
|
||||
mc = concat(mc.get(), m_solver->get_model_converter().get());
|
||||
return mc;
|
||||
}
|
||||
virtual proof * get_proof() { return m_solver->get_proof(); }
|
||||
virtual std::string reason_unknown() const { return m_solver->reason_unknown(); }
|
||||
virtual void set_reason_unknown(char const* msg) { m_solver->set_reason_unknown(msg); }
|
||||
virtual void get_labels(svector<symbol> & r) { m_solver->get_labels(r); }
|
||||
virtual ast_manager& get_manager() const { return m; }
|
||||
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes) { return m_solver->find_mutexes(vars, mutexes); }
|
||||
virtual expr_ref_vector cube(expr_ref_vector& vars, unsigned backtrack_level) { return m_solver->cube(vars, backtrack_level); }
|
||||
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes) {
|
||||
return m_solver->find_mutexes(vars, mutexes);
|
||||
}
|
||||
virtual expr_ref_vector cube(expr_ref_vector& vars, unsigned backtrack_level) {
|
||||
return m_solver->cube(vars, backtrack_level);
|
||||
}
|
||||
|
||||
virtual lbool get_consequences_core(expr_ref_vector const& asms, expr_ref_vector const& vars, expr_ref_vector& consequences) {
|
||||
datatype_util dt(m);
|
||||
|
|
@ -152,20 +178,7 @@ public:
|
|||
return r;
|
||||
}
|
||||
|
||||
void filter_model(model_ref& mdl) {
|
||||
generic_model_converter filter(m);
|
||||
for (auto const& kv : m_rewriter.enum2bv()) {
|
||||
filter.hide(kv.m_value);
|
||||
}
|
||||
filter(mdl);
|
||||
}
|
||||
|
||||
void extend_model(model_ref& mdl) {
|
||||
generic_model_converter ext(m);
|
||||
for (auto const& kv : m_rewriter.enum2def())
|
||||
ext.add(kv.m_key, kv.m_value);
|
||||
ext(mdl);
|
||||
}
|
||||
|
||||
virtual unsigned get_num_assertions() const {
|
||||
return m_solver->get_num_assertions();
|
||||
|
|
|
|||
|
|
@ -50,9 +50,10 @@ public:
|
|||
virtual solver* translate(ast_manager& dst_m, params_ref const& p) {
|
||||
flush_assertions();
|
||||
solver* result = alloc(pb2bv_solver, dst_m, p, m_solver->translate(dst_m, p));
|
||||
if (mc0()) {
|
||||
model_converter_ref mc = external_model_converter();
|
||||
if (mc.get()) {
|
||||
ast_translation tr(m, dst_m);
|
||||
result->set_model_converter(mc0()->translate(tr));
|
||||
result->set_model_converter(mc->translate(tr));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -93,7 +94,14 @@ public:
|
|||
filter_model(mdl);
|
||||
}
|
||||
}
|
||||
virtual model_converter_ref get_model_converter() const { return m_solver->get_model_converter(); }
|
||||
model_converter* external_model_converter() const {
|
||||
return concat(mc0(), filter_model_converter());
|
||||
}
|
||||
virtual model_converter_ref get_model_converter() const {
|
||||
model_converter_ref mc = concat(mc0(), filter_model_converter());
|
||||
mc = concat(mc.get(), m_solver->get_model_converter().get());
|
||||
return mc;
|
||||
}
|
||||
virtual proof * get_proof() { return m_solver->get_proof(); }
|
||||
virtual std::string reason_unknown() const { return m_solver->reason_unknown(); }
|
||||
virtual void set_reason_unknown(char const* msg) { m_solver->set_reason_unknown(msg); }
|
||||
|
|
@ -105,16 +113,23 @@ public:
|
|||
flush_assertions();
|
||||
return m_solver->get_consequences(asms, vars, consequences); }
|
||||
|
||||
void filter_model(model_ref& mdl) {
|
||||
model_converter* filter_model_converter() const {
|
||||
if (m_rewriter.fresh_constants().empty()) {
|
||||
return;
|
||||
return nullptr;
|
||||
}
|
||||
generic_model_converter filter(m);
|
||||
generic_model_converter* filter = alloc(generic_model_converter, m, "pb2bv");
|
||||
func_decl_ref_vector const& fns = m_rewriter.fresh_constants();
|
||||
for (func_decl* f : fns) {
|
||||
filter.hide(f);
|
||||
filter->hide(f);
|
||||
}
|
||||
return filter;
|
||||
}
|
||||
|
||||
void filter_model(model_ref& mdl) {
|
||||
model_converter_ref mc = filter_model_converter();
|
||||
if (mc.get()) {
|
||||
(*mc)(mdl);
|
||||
}
|
||||
filter(mdl);
|
||||
}
|
||||
|
||||
virtual unsigned get_num_assertions() const {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue