mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 11:25:51 +00:00
Code Activity

fixes to #52, #53

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-04-28 14:48:59 -07:00
parent ffc3a36dcb
commit a0f0b53686
7 changed files with 80 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/opt/opt_context.cpp
View file

@ -388,7 +388,6 @@ namespace opt {
}
break;
case O_MAXSMT: {
m_opt_solver->ensure_pb();
pb_util pb(m);
unsigned sz = obj.m_terms.size();
ptr_vector<expr> terms;
@ -475,6 +474,9 @@ namespace opt {
m_opt_solver->set_logic(m_logic);
m_solver = m_opt_solver.get();
}
if (opt_params(m_params).priority() == symbol("pareto")) {
m_opt_solver->ensure_pb();
}
}
void context::setup_arith_solver() {
@ -497,6 +499,9 @@ namespace opt {
m_maxsat_engine != symbol("sls")) {
return;
}
if (opt_params(m_params).priority() == symbol("pareto")) {
return;
}
m_params.set_bool("minimize_core_partial", true); // false);
m_params.set_bool("minimize_core", true);
m_sat_solver = mk_inc_sat_solver(m, m_params);