mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 08:28:44 +00:00
Code Activity

tweaking input processing

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-12-03 08:51:46 -08:00
parent 03f5020d0b
commit 51704b7b95
2 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/opt/opt_context.cpp
View file

@ -60,14 +60,14 @@ namespace opt {
return execute_maxsat(obj, committed); return execute_maxsat(obj, committed);
} }
if (obj->get_family_id() != m_obj_util.get_family_id()) { if (obj->get_family_id() != m_obj_util.get_family_id()) {
// error return execute_min_max(obj, committed, true);
return l_undef;
} }
switch (obj->get_decl_kind()) { switch (obj->get_decl_kind()) {
case OP_MINIMIZE: case OP_MINIMIZE:
return execute_min_max(to_app(obj->get_arg(0)), committed, false);
case OP_MAXIMIZE: case OP_MAXIMIZE:
return execute_min_max(obj, committed); return execute_min_max(to_app(obj->get_arg(0)), committed, true);
case OP_LEX: case OP_LEX:
return execute_lex(obj); return execute_lex(obj);
case OP_BOX: case OP_BOX:
@ -80,15 +80,15 @@ namespace opt {
} }
} }
lbool context::execute_min_max(app* obj, bool committed) { lbool context::execute_min_max(app* obj, bool committed, bool is_max) {
// HACK: reuse m_optsmt but add only a single objective each round // HACK: reuse m_optsmt but add only a single objective each round
bool is_max = (obj->get_decl_kind() == OP_MAXIMIZE); m_optsmt.add(obj, is_max);
m_optsmt.add(to_app(obj->get_arg(0)), is_max);
lbool result = m_optsmt(get_solver()); lbool result = m_optsmt(get_solver());
if (committed) m_optsmt.commit_assignment(0); if (committed) m_optsmt.commit_assignment(0);
return result; return result;
} }
lbool context::execute_maxsat(app* obj, bool committed) { lbool context::execute_maxsat(app* obj, bool committed) {
maxsmt* ms; maxsmt* ms;
VERIFY(m_maxsmts.find(obj->get_decl()->get_name(), ms)); VERIFY(m_maxsmts.find(obj->get_decl()->get_name(), ms));
@ -133,13 +133,14 @@ namespace opt {
} }
lbool context::optimize(expr* objective) { lbool context::optimize(expr* objective) {
if (!objective) {
return optimize();
}
opt_solver& s = get_solver(); opt_solver& s = get_solver();
solver::scoped_push _sp(s); solver::scoped_push _sp(s);
for (unsigned i = 0; i < m_hard_constraints.size(); ++i) { for (unsigned i = 0; i < m_hard_constraints.size(); ++i) {
s.assert_expr(m_hard_constraints[i].get()); s.assert_expr(m_hard_constraints[i].get());
} }
return execute(objective, false); return execute(objective, false);
} }
@ -147,23 +148,20 @@ namespace opt {
// Construct objectives // Construct objectives
expr_ref_vector objectives(m); expr_ref_vector objectives(m);
expr_ref objective(m); expr_ref objective(m);
objective_util util(m);
map_t::iterator it = m_maxsmts.begin(), end = m_maxsmts.end(); map_t::iterator it = m_maxsmts.begin(), end = m_maxsmts.end();
for (; it != end; ++it) { for (; it != end; ++it) {
objectives.push_back(util.mk_maxsat(it->m_key)); objectives.push_back(m_obj_util.mk_maxsat(it->m_key));
} }
for (unsigned i = 0; i < m_objs.size(); ++i) { for (unsigned i = 0; i < m_objs.size(); ++i) {
expr_ref e(m_objs[i].get(), m); expr_ref e(m_objs[i].get(), m);
app * o = m_ismaxs[i] ? util.mk_max(e) : util.mk_min(e); app * o = m_ismaxs[i] ? m_obj_util.mk_max(e) : m_obj_util.mk_min(e);
objectives.push_back(o); objectives.push_back(o);
} }
if (m_params.get_bool("pareto", false)) { if (m_params.get_bool("pareto", false)) {
objective = util.mk_pareto(objectives.size(), objectives.c_ptr()); objective = m_obj_util.mk_pareto(objectives.size(), objectives.c_ptr());
} }
else { else {
objective = util.mk_box(objectives.size(), objectives.c_ptr()); objective = m_obj_util.mk_box(objectives.size(), objectives.c_ptr());
} }
return optimize(objective); return optimize(objective);
} }

2
src/opt/opt_context.h
View file

@ -69,7 +69,7 @@ namespace opt {
void validate_feasibility(maxsmt& ms); void validate_feasibility(maxsmt& ms);
lbool execute(expr* obj, bool committed); lbool execute(expr* obj, bool committed);
lbool execute_min_max(app* obj, bool committed); lbool execute_min_max(app* obj, bool committed, bool is_max);
lbool execute_maxsat(app* obj, bool committed); lbool execute_maxsat(app* obj, bool committed);
lbool execute_lex(app* obj); lbool execute_lex(app* obj);
lbool execute_box(app* obj); lbool execute_box(app* obj);