mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

enable neat vs. less neat pretty priting as an option

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-09-09 16:25:41 -07:00
parent f7e1ad5277
commit f151879c0b
9 changed files with 98 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/opt/opt_context.cpp
View file

@ -38,6 +38,7 @@ Notes:
#include "inc_sat_solver.h"
#include "bv_decl_plugin.h"
#include "pb_decl_plugin.h"
#include "ast_smt_pp.h"
namespace opt {
@ -122,7 +123,8 @@ namespace opt {
m_fm(m),
m_objective_refs(m),
m_enable_sat(false),
m_enable_sls(false)
m_enable_sls(false),
m_pp_neat(false)
{
params_ref p;
p.set_bool("model", true);
@ -1063,6 +1065,7 @@ namespace opt {
m_enable_sat = _p.enable_sat();
m_enable_sls = _p.enable_sls();
m_maxsat_engine = _p.maxsat_engine();
m_pp_neat = _p.pp_neat();
}
typedef obj_hashtable<func_decl> func_decl_set;
@ -1095,9 +1098,11 @@ namespace opt {
std::string context::to_string() const {
smt2_pp_environment_dbg env(m);
ast_smt_pp ll_smt2_pp(m);
free_func_visitor visitor(m);
std::ostringstream out;
#define PP(_e_) ast_smt2_pp(out, _e_, env);
#define PPE(_e_) if (m_pp_neat) ast_smt2_pp(out, _e_, env); else ll_smt2_pp.display_expr_smt2(out, _e_);
for (unsigned i = 0; i < m_scoped_state.m_hard.size(); ++i) {
visitor.collect(m_scoped_state.m_hard[i]);
}
@ -1132,7 +1137,7 @@ namespace opt {
}
for (unsigned i = 0; i < m_scoped_state.m_hard.size(); ++i) {
out << "(assert ";
PP(m_scoped_state.m_hard[i]);
PPE(m_scoped_state.m_hard[i]);
out << ")\n";
}
for (unsigned i = 0; i < m_scoped_state.m_objectives.size(); ++i) {

1
src/opt/opt_context.h
View file

@ -127,6 +127,7 @@ namespace opt {
tactic_ref m_simplify;
bool m_enable_sat;
bool m_enable_sls;
bool m_pp_neat;
symbol m_maxsat_engine;
symbol m_logic;
public:

1
src/opt/opt_params.pyg
View file

@ -10,6 +10,7 @@ def_module_params('opt',
('enable_sls', BOOL, False, 'enable SLS tuning during weighted maxsast'),
('enable_sat', BOOL, False, 'enable the new SAT core for propositional constraints'),
('elim_01', BOOL, True, 'eliminate 01 variables'),
('pp.neat', BOOL, True, 'use neat (as opposed to less readable, but faster) pretty printer when displaying context'),
('pb.compile_equality', BOOL, False, 'compile arithmetical equalities into pseudo-Boolean equality (instead of two inequalites)'),
('maxres.hill_climb', BOOL, True, 'give preference for large weight cores'),
('maxres.add_upper_bound_block', BOOL, False, 'restict upper bound with constraint'),