mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00
Code Activity

dealing with cancel

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-10-30 13:38:47 -07:00
parent 946b888b32
commit 86151b4d52
5 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/opt/opt_context.cpp
View file

@ -26,7 +26,6 @@ Notes:
#include "opt_context.h"
#include "fu_malik.h"
#include "weighted_maxsat.h"
#include "optimize_objectives.h"
#include "ast_pp.h"
#include "opt_solver.h"
#include "arith_decl_plugin.h"
@ -39,7 +38,8 @@ namespace opt {
m(m),
m_hard_constraints(m),
m_soft_constraints(m),
m_objectives(m)
m_objectives(m),
m_opt_objectives(m)
{
m_params.set_bool("model", true);
m_params.set_bool("unsat_core", true);
@ -83,8 +83,7 @@ namespace opt {
for (unsigned i = 0; i < fmls_copy.size(); ++i) {
s->assert_expr(fmls_copy[i].get());
}
optimize_objectives obj(m, get_opt_solver(*s)); // TBD: make an attribute
is_sat = obj(m_objectives, values);
is_sat = m_opt_objectives(get_opt_solver(*s), m_objectives, values);
std::cout << "is-sat: " << is_sat << std::endl;
if (is_sat != l_true) {
@ -126,12 +125,14 @@ namespace opt {
if (m_solver) {
m_solver->cancel();
}
m_opt_objectives.set_cancel(true);
}
void context::reset_cancel() {
if (m_solver) {
m_solver->reset_cancel();
}
m_opt_objectives.set_cancel(false);
}
void context::add_objective(app* t, bool is_max) {