mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 10:52:02 +00:00
Code Activity

Revise optimize commands

Browse source
This commit is contained in:
Anh-Dung Phan 2013-11-26 12:54:18 -08:00
parent dbc791d385
commit 4aa9c742ab
3 changed files with 169 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/opt/opt_context.cpp
View file

@ -111,6 +111,17 @@ namespace opt {
return execute_lex(obj);
}
lbool context::optimize(objective & objective) {
opt_solver& s = *m_solver.get();
solver::scoped_push _sp(s);
for (unsigned i = 0; i < m_hard_constraints.size(); ++i) {
s.assert_expr(m_hard_constraints[i].get());
}
return execute(objective, false);
}
lbool context::optimize() {
// Construct objectives
ptr_vector<objective> objectives;
@ -133,14 +144,7 @@ namespace opt {
objective = objective::mk_box(objectives.size(), objectives.c_ptr());
}
opt_solver& s = *m_solver.get();
solver::scoped_push _sp(s);
for (unsigned i = 0; i < m_hard_constraints.size(); ++i) {
s.assert_expr(m_hard_constraints[i].get());
}
lbool result = execute(*objective, false);
lbool result = optimize(*objective);
dealloc(objective);
return result;
}