mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 04:03:39 +00:00
Code Activity

fix #7578

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-03-09 17:01:42 -07:00
parent c002c77e5a
commit ea1360ee46
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/opt/optsmt.cpp
View file

@ -109,6 +109,7 @@ namespace opt {
rational delta_per_step(1); rational delta_per_step(1);
unsigned num_scopes = 0; unsigned num_scopes = 0;
unsigned delta_index = 0; // index of objective to speed up. unsigned delta_index = 0; // index of objective to speed up.
bool has_bound = false; // is the current objective bounded by a constraint.
while (m.inc()) { while (m.inc()) {
SASSERT(delta_per_step.is_int()); SASSERT(delta_per_step.is_int());
@ -116,6 +117,8 @@ namespace opt {
is_sat = m_s->check_sat(0, nullptr); is_sat = m_s->check_sat(0, nullptr);
if (is_sat == l_true) { if (is_sat == l_true) {
bound = update_lower(); bound = update_lower();
if (!m.is_true(bound))
has_bound = true;
if (!can_increment_delta(lower, delta_index)) { if (!can_increment_delta(lower, delta_index)) {
delta_per_step = 1; delta_per_step = 1;
} }
@ -133,10 +136,12 @@ namespace opt {
// only try to improve delta_index. // only try to improve delta_index.
bound = m_s->mk_ge(delta_index, m_lower[delta_index] + inf_eps(delta_per_step)); bound = m_s->mk_ge(delta_index, m_lower[delta_index] + inf_eps(delta_per_step));
} }
TRACE("opt", tout << mk_pp(m_objs.get(delta_index), m) << " index: " << delta_index << " delta: " << delta_per_step << " : " << bound << "\n";); TRACE("opt", tout << mk_pp(m_objs.get(delta_index), m) << " index: " << delta_index
<< " delta: " << delta_per_step << " bound: " << bound
<< " " << m_lower[delta_index] << " " << m_upper[delta_index] << "\n");
if (bound == last_bound) { if (bound == last_bound) {
is_sat = l_false; is_sat = l_false;
if (!m_lower[delta_index].is_finite() && !m_upper[delta_index].is_finite()) if ((!has_bound || !m_lower[delta_index].is_finite()) && !m_upper[delta_index].is_finite())
m_lower[delta_index] = m_upper[delta_index]; m_lower[delta_index] = m_upper[delta_index];
} }
else { else {
@ -171,9 +176,11 @@ namespace opt {
steps = 0; steps = 0;
step_incs = 0; step_incs = 0;
++delta_index; ++delta_index;
has_bound = false;
} }
else { else {
if (num_scopes > 0) m_s->pop(num_scopes); if (num_scopes > 0)
m_s->pop(num_scopes);
num_scopes = 0; num_scopes = 0;
break; break;
} }