From 0e6c64510ac3bd4392204a4da3921d4eb414820d Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Tue, 7 Jun 2022 13:14:36 -0700
Subject: [PATCH] display model in add/del format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
src/tactic/model_converter.cpp | 41 ++++++++++++++++++++++------------
src/tactic/model_converter.h | 7 ++++--
2 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/src/tactic/model_converter.cpp b/src/tactic/model_converter.cpp
index 6bb2f48c5..55b7b27b4 100644
--- a/src/tactic/model_converter.cpp
+++ b/src/tactic/model_converter.cpp
@@ -23,12 +23,16 @@ Notes:
/*
* Add or overwrite value in model.
*/
-void model_converter::display_add(std::ostream& out, ast_manager& m, func_decl* f, expr* e) const {
+void model_converter::display_add(std::ostream& out, smt2_pp_environment& env, ast_manager& m, func_decl* f, expr* e) {
VERIFY(e);
- smt2_pp_environment_dbg env(m);
- smt2_pp_environment* _env = m_env ? m_env : &env;
VERIFY(f->get_range() == e->get_sort());
- ast_smt2_pp(out, f, e, *_env, params_ref(), 0, "model-add") << "\n";
+ ast_smt2_pp(out, f, e, env, params_ref(), 0, "model-add") << "\n";
+}
+
+void model_converter::display_add(std::ostream& out, ast_manager& m, func_decl* f, expr* e) const {
+ smt2_pp_environment_dbg dbgenv(m);
+ smt2_pp_environment& env = m_env ? *m_env : dbgenv;
+ display_add(out, env, m, f, e);
}
/*
@@ -57,14 +61,22 @@ void model_converter::display_add(std::ostream& out, ast_manager& m) {
// default printer for converter that adds entries
model_ref mdl = alloc(model, m);
(*this)(mdl);
- for (unsigned i = 0, sz = mdl->get_num_constants(); i < sz; ++i) {
- func_decl* f = mdl->get_constant(i);
- display_add(out, m, f, mdl->get_const_interp(f));
+ smt2_pp_environment_dbg dbgenv(m);
+ smt2_pp_environment& env = m_env ? *m_env : dbgenv;
+ display_add(out, env, *mdl);
+}
+
+void model_converter::display_add(std::ostream& out, smt2_pp_environment& env, model& mdl) {
+
+ ast_manager& m = mdl.get_manager();
+ for (unsigned i = 0, sz = mdl.get_num_constants(); i < sz; ++i) {
+ func_decl* f = mdl.get_constant(i);
+ display_add(out, env, m, f, mdl.get_const_interp(f));
}
- for (unsigned i = 0, sz = mdl->get_num_functions(); i < sz; ++i) {
- func_decl* f = mdl->get_function(i);
- func_interp* fi = mdl->get_func_interp(f);
- display_add(out, m, f, fi->get_interp());
+ for (unsigned i = 0, sz = mdl.get_num_functions(); i < sz; ++i) {
+ func_decl* f = mdl.get_function(i);
+ func_interp* fi = mdl.get_func_interp(f);
+ display_add(out, env, m, f, fi->get_interp());
}
}
@@ -153,9 +165,10 @@ public:
}
void display(std::ostream & out) override {
- out << "(rmodel->model-converter-wrapper\n";
- model_v2_pp(out, *m_model);
- out << ")\n";
+ ast_manager& m = m_model->get_manager();
+ smt2_pp_environment_dbg dbgenv(m);
+ smt2_pp_environment& env = m_env ? *m_env : dbgenv;
+ model_converter::display_add(out, env, *m_model);
}
model_converter * translate(ast_translation & translator) override {
diff --git a/src/tactic/model_converter.h b/src/tactic/model_converter.h
index 3ed9f298b..377ecce67 100644
--- a/src/tactic/model_converter.h
+++ b/src/tactic/model_converter.h
@@ -64,11 +64,11 @@ class smt2_pp_environment;
class model_converter : public converter {
protected:
- smt2_pp_environment* m_env;
+ smt2_pp_environment* m_env;
+ static void display_add(std::ostream& out, smt2_pp_environment& env, ast_manager& m, func_decl* f, expr* e);
void display_add(std::ostream& out, ast_manager& m, func_decl* f, expr* e) const;
void display_del(std::ostream& out, func_decl* f) const;
void display_add(std::ostream& out, ast_manager& m);
-
public:
model_converter(): m_env(nullptr) {}
@@ -90,6 +90,9 @@ public:
*/
virtual void get_units(obj_map<expr, bool>& fmls) { UNREACHABLE(); }
+
+ static void display_add(std::ostream& out, smt2_pp_environment& env, model& mdl);
+
};
typedef ref<model_converter> model_converter_ref;