From 6df3e47b0763e7e206be64e48aedf6582bfb363d Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Thu, 2 Nov 2017 09:53:47 -0500
Subject: [PATCH] disable symbol fixing in pretty printer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
src/ast/ast_smt2_pp.cpp | 9 +++++----
src/solver/solver.cpp | 25 ++++++++++++++-----------
src/tactic/filter_model_converter.cpp | 1 -
3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/ast/ast_smt2_pp.cpp b/src/ast/ast_smt2_pp.cpp
index c1130f7c2..bb5359c19 100644
--- a/src/ast/ast_smt2_pp.cpp
+++ b/src/ast/ast_smt2_pp.cpp
@@ -31,12 +31,13 @@ using namespace format_ns;
#define MAX_INDENT 16
#define SMALL_INDENT 2
-format * smt2_pp_environment::pp_fdecl_name(symbol const & s0, unsigned & len, bool is_skolem) const {
+format * smt2_pp_environment::pp_fdecl_name(symbol const & s, unsigned & len, bool is_skolem) const {
ast_manager & m = get_manager();
- symbol s = m_renaming.get_symbol(s0, is_skolem);
- len = static_cast<unsigned>(strlen(s.bare_str()));
- return mk_string(m, s.bare_str());
#if 0
+ symbol s1 = m_renaming.get_symbol(s, is_skolem);
+ len = static_cast<unsigned>(strlen(s1.bare_str()));
+ return mk_string(m, s1.bare_str());
+#else
if (is_smt2_quoted_symbol(s)) {
std::string str = mk_smt2_quoted_symbol(s);
len = static_cast<unsigned>(str.length());
diff --git a/src/solver/solver.cpp b/src/solver/solver.cpp
index 89625b20c..83982e290 100644
--- a/src/solver/solver.cpp
+++ b/src/solver/solver.cpp
@@ -16,13 +16,14 @@ Author:
Notes:
--*/
-#include "solver/solver.h"
-#include "model/model_evaluator.h"
+#include "util/common_msgs.h"
+#include "util/stopwatch.h"
#include "ast/ast_util.h"
#include "ast/ast_pp.h"
#include "ast/ast_pp_util.h"
-#include "util/common_msgs.h"
#include "tactic/model_converter.h"
+#include "solver/solver.h"
+#include "model/model_evaluator.h"
unsigned solver::get_num_assertions() const {
@@ -37,27 +38,29 @@ expr * solver::get_assertion(unsigned idx) const {
std::ostream& solver::display(std::ostream & out, unsigned n, expr* const* assumptions) const {
expr_ref_vector fmls(get_manager());
- //std::cout << "display 1\n";
+ stopwatch sw;
+ sw.start();
+ std::cout << "display 1\n";
get_assertions(fmls);
- //std::cout << "display 2\n";
+ std::cout << "display 2 " << sw.get_current_seconds() << "\n";
ast_pp_util visitor(get_manager());
model_converter_ref mc = get_model_converter();
- //std::cout << "display 3\n";
+ std::cout << "display 3 " << sw.get_current_seconds() << "\n";
if (mc.get()) {
mc->collect(visitor);
}
- //std::cout << "display 4\n";
+ std::cout << "display 4 " << sw.get_current_seconds() << "\n";
visitor.collect(fmls);
- //std::cout << "display 5\n";
+ std::cout << "display 5 " << sw.get_current_seconds() << "\n";
visitor.collect(n, assumptions);
visitor.display_decls(out);
- //std::cout << "display 6\n";
+ std::cout << "display 6 " << sw.get_current_seconds() << "\n";
visitor.display_asserts(out, fmls, true);
- //std::cout << "display 7\n";
+ std::cout << "display 7 " << sw.get_current_seconds() << "\n";
if (mc.get()) {
mc->display(out);
}
- //std::cout << "display 8\n";
+ std::cout << "display 8 " << sw.get_current_seconds() << "\n";
return out;
}
diff --git a/src/tactic/filter_model_converter.cpp b/src/tactic/filter_model_converter.cpp
index 4041e9275..7400063e1 100644
--- a/src/tactic/filter_model_converter.cpp
+++ b/src/tactic/filter_model_converter.cpp
@@ -69,7 +69,6 @@ model_converter * filter_model_converter::translate(ast_translation & translator
void filter_model_converter::collect(ast_pp_util& visitor) {
m_env = &visitor.env();
- std::cout << "collect filter: " << m_decls.size() << "\n";
for (func_decl* f : m_decls) visitor.coll.visit_func(f);
}