mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

move model_evaluator from pdr to model, call it model_implicant

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-11-23 21:33:35 +01:00
parent b35088f7e5
commit 2ff51e9a60
11 changed files with 1514 additions and 1341 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/opt/fu_malik.cpp
View file

@ -243,7 +243,7 @@ namespace opt {
void set_solver() {
opt_solver & opt_s = opt_solver::to_opt(m_original_solver);
if (opt_s.is_dumping_benchmark())
if (opt_s.dump_benchmarks())
return;
solver& current_solver = s();

19
src/opt/opt_solver.cpp
View file

@ -35,7 +35,8 @@ namespace opt {
m_context(mgr, m_params),
m(mgr),
m_objective_enabled(false),
m_is_dump(false) {
m_dump_benchmarks(false),
m_dump_count(0) {
m_logic = l;
if (m_logic != symbol::null)
m_context.set_logic(m_logic);
@ -45,7 +46,7 @@ namespace opt {
}
void opt_solver::updt_params(params_ref const & p) {
m_is_dump = p.get_bool("dump_benchmarks", false);
m_dump_benchmarks = p.get_bool("dump_benchmarks", false);
m_params.updt_params(p);
m_context.updt_params(p);
}
@ -105,22 +106,22 @@ namespace opt {
static unsigned g_checksat_count = 0;
bool opt_solver::is_dumping_benchmark() {
return m_is_dump;
bool opt_solver::dump_benchmarks() {
return m_dump_benchmarks;
}
lbool opt_solver::check_sat_core(unsigned num_assumptions, expr * const * assumptions) {
TRACE("opt_solver_na2as", {
tout << "opt_opt_solver::check_sat_core: " << m_context.size() << "\n";
TRACE("opt", {
tout << "context size: " << m_context.size() << "\n";
for (unsigned i = 0; i < m_context.size(); ++i) {
tout << mk_pp(m_context.get_formulas()[i], m_context.m()) << "\n";
tout << mk_pp(m_context.get_formulas()[i], m_context.m()) << "\n";
}
});
lbool r = m_context.check(num_assumptions, assumptions);
if (m_is_dump) {
if (dump_benchmarks()) {
std::stringstream file_name;
file_name << "opt_solver" << ++g_checksat_count << ".smt2";
file_name << "opt_solver" << ++m_dump_count << ".smt2";
std::ofstream buffer(file_name.str().c_str());
to_smt2_benchmark(buffer, "opt_solver", "QF_BV");
buffer.close();

5
src/opt/opt_solver.h
View file

@ -46,7 +46,8 @@ namespace opt {
bool m_objective_enabled;
svector<smt::theory_var> m_objective_vars;
vector<inf_eps> m_objective_values;
bool m_is_dump;
bool m_dump_benchmarks;
unsigned m_dump_count;
statistics m_stats;
public:
opt_solver(ast_manager & m, params_ref const & p, symbol const & l);
@ -79,7 +80,7 @@ namespace opt {
static opt_solver& to_opt(solver& s);
void set_interim_stats(statistics & st);
bool is_dumping_benchmark();
bool dump_benchmarks();
class toggle_objective {
opt_solver& s;