mirror of
https://github.com/Z3Prover/z3
synced 2025-04-23 09:05:31 +00:00
* fixing #4670 Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * init Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * arrays Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * arrays Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * arrays Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner
GitHub
parent
ee00542e76
commit
cfa7c733db
48 changed files with 1591 additions and 359 deletions
|
|
@ -387,6 +387,7 @@ namespace opt {
|
|||
|
||||
void context::get_model_core(model_ref& mdl) {
|
||||
mdl = m_model;
|
||||
CTRACE("opt", mdl, tout << *mdl;);
|
||||
fix_model(mdl);
|
||||
if (mdl) mdl->set_model_completion(true);
|
||||
CTRACE("opt", mdl, tout << *mdl;);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ namespace opt {
|
|||
}
|
||||
m_params.m_arith_auto_config_simplex = false;
|
||||
m_params.m_threads = 1; // need to interact with the solver that created model so can't have threads
|
||||
m_was_sat = false;
|
||||
// m_params.m_auto_config = false;
|
||||
}
|
||||
|
||||
|
|
@ -85,11 +84,11 @@ namespace opt {
|
|||
}
|
||||
|
||||
void opt_solver::assert_expr_core(expr * t) {
|
||||
m_last_model = nullptr;
|
||||
if (has_quantifiers(t)) {
|
||||
m_params.m_relevancy_lvl = 2;
|
||||
}
|
||||
m_context.assert_expr(t);
|
||||
m_was_sat = false;
|
||||
}
|
||||
|
||||
void opt_solver::push_core() {
|
||||
|
|
@ -182,6 +181,7 @@ namespace opt {
|
|||
verbose_stream().flush(););
|
||||
}
|
||||
lbool r;
|
||||
m_last_model = nullptr;
|
||||
if (m_first && num_assumptions == 0 && m_context.get_scope_level() == 0) {
|
||||
r = m_context.setup_and_check();
|
||||
}
|
||||
|
|
@ -189,9 +189,8 @@ namespace opt {
|
|||
r = m_context.check(num_assumptions, assumptions);
|
||||
}
|
||||
r = adjust_result(r);
|
||||
m_was_sat = r == l_true;
|
||||
if (r == l_true) {
|
||||
m_context.get_model(m_model);
|
||||
m_context.get_model(m_last_model);
|
||||
}
|
||||
m_first = false;
|
||||
if (dump_benchmarks()) {
|
||||
|
|
@ -240,35 +239,40 @@ namespace opt {
|
|||
void opt_solver::maximize_objective(unsigned i, expr_ref& blocker) {
|
||||
smt::theory_var v = m_objective_vars[i];
|
||||
bool has_shared = false;
|
||||
m_last_model = nullptr;
|
||||
inf_eps val = get_optimizer().maximize(v, blocker, has_shared);
|
||||
get_model(m_model);
|
||||
m_context.get_model(m_last_model);
|
||||
inf_eps val2;
|
||||
m_valid_objectives[i] = true;
|
||||
has_shared = true;
|
||||
TRACE("opt", tout << (has_shared?"has shared":"non-shared") << " " << val << " " << blocker << "\n";);
|
||||
if (!m_models[i]) {
|
||||
set_model(i);
|
||||
}
|
||||
if (!m_models[i])
|
||||
m_models.set(i, m_last_model.get());
|
||||
|
||||
if (!val.is_finite()) {
|
||||
// skip model updates
|
||||
}
|
||||
else if (m_context.get_context().update_model(has_shared)) {
|
||||
m_last_model = nullptr;
|
||||
m_context.get_model(m_last_model);
|
||||
if (has_shared && val != current_objective_value(i)) {
|
||||
decrement_value(i, val);
|
||||
m_last_model = nullptr;
|
||||
if (l_true != m_context.check(0, nullptr))
|
||||
throw default_exception("maximization suspended");
|
||||
m_was_sat = true;
|
||||
m_context.get_model(m_last_model);
|
||||
}
|
||||
else {
|
||||
set_model(i);
|
||||
m_models.set(i, m_last_model.get());
|
||||
}
|
||||
}
|
||||
else {
|
||||
m_last_model = nullptr;
|
||||
SASSERT(has_shared);
|
||||
decrement_value(i, val);
|
||||
if (l_true != m_context.check(0, nullptr))
|
||||
throw default_exception("maximization suspended");
|
||||
m_was_sat = true;
|
||||
m_context.get_model(m_last_model);
|
||||
}
|
||||
m_objective_values[i] = val;
|
||||
TRACE("opt", {
|
||||
|
|
@ -278,12 +282,6 @@ namespace opt {
|
|||
if (m_models[i]) model_smt2_pp(tout << "update model:\n", m, *m_models[i], 0); });
|
||||
}
|
||||
|
||||
void opt_solver::set_model(unsigned i) {
|
||||
model_ref mdl;
|
||||
get_model(mdl);
|
||||
m_models.set(i, mdl.get());
|
||||
}
|
||||
|
||||
lbool opt_solver::decrement_value(unsigned i, inf_eps& val) {
|
||||
push_core();
|
||||
expr_ref ge = mk_ge(i, val);
|
||||
|
|
@ -291,9 +289,9 @@ namespace opt {
|
|||
assert_expr(ge);
|
||||
lbool is_sat = m_context.check(0, nullptr);
|
||||
is_sat = adjust_result(is_sat);
|
||||
m_was_sat = is_sat == l_true;
|
||||
if (is_sat == l_true) {
|
||||
set_model(i);
|
||||
m_context.get_model(m_last_model);
|
||||
m_models.set(i, m_last_model.get());
|
||||
}
|
||||
pop_core(1);
|
||||
TRACE("opt", tout << is_sat << "\n";);
|
||||
|
|
@ -327,14 +325,14 @@ namespace opt {
|
|||
}
|
||||
}
|
||||
|
||||
void opt_solver::get_model_core(model_ref & m) {
|
||||
if (m_was_sat) {
|
||||
m_context.get_model(m);
|
||||
if (!m) m = m_model; else m_model = m;
|
||||
}
|
||||
else {
|
||||
m = nullptr;
|
||||
}
|
||||
void opt_solver::get_model_core(model_ref & m) {
|
||||
for (auto* mdl : m_models) {
|
||||
if (mdl) {
|
||||
m = mdl;
|
||||
return;
|
||||
}
|
||||
}
|
||||
m = m_last_model.get();
|
||||
}
|
||||
|
||||
proof * opt_solver::get_proof() {
|
||||
|
|
|
|||
|
|
@ -72,8 +72,7 @@ namespace opt {
|
|||
generic_model_converter& m_fm;
|
||||
progress_callback * m_callback;
|
||||
symbol m_logic;
|
||||
model_ref m_model;
|
||||
bool m_was_sat;
|
||||
model_ref m_last_model;
|
||||
svector<smt::theory_var> m_objective_vars;
|
||||
vector<inf_eps> m_objective_values;
|
||||
sref_vector<model> m_models;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue