mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

fix #2081

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-01-13 01:18:03 -08:00
parent dc5e4ca1c5
commit 4b35ef29c9
6 changed files with 78 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/opt/opt_context.cpp
View file

@ -437,7 +437,7 @@ namespace opt {
for (unsigned i = 0; r == l_true && i < sz; ++i) {
objective const& o = m_objectives[i];
bool is_last = i + 1 == sz;
r = execute(o, i + 1 < sz, sc && !is_last && o.m_type != O_MAXSMT);
r = execute(o, i + 1 < sz, sc && !is_last);
if (r == l_true && o.m_type == O_MINIMIZE && !get_lower_as_num(i).is_finite()) {
return r;
}

4
src/opt/wmax.cpp
View file

@ -75,11 +75,9 @@ namespace opt {
trace_bounds("wmax");
TRACE("opt",
s().display(tout); tout << "\n";
s().display(tout)<< "\n";
tout << "lower: " << m_lower << " upper: " << m_upper << "\n";);
while (!m.canceled() && m_lower < m_upper) {
//mk_assumptions(asms);
//is_sat = s().preferred_sat(asms, cores);
is_sat = s().check_sat(0, nullptr);
if (m.canceled()) {
is_sat = l_undef;