3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 03:45:51 +00:00

fix lex bug for maxres case

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-10-11 01:05:30 -07:00
parent 70f5eb4a9d
commit f7f4feaa47
5 changed files with 57 additions and 40 deletions

View file

@ -66,6 +66,7 @@ namespace opt {
}
pb_util pb(m);
tmp = pb.mk_ge(m_weights.size(), m_weights.c_ptr(), m_soft.c_ptr(), k);
TRACE("opt", tout << tmp << "\n";);
s().assert_expr(tmp);
}
@ -205,18 +206,13 @@ namespace opt {
}
}
// Infrastructure for displaying and storing solution is TBD.
IF_VERBOSE(1, verbose_stream() << "is-sat: " << is_sat << "\n";
if (is_sat == l_true) {
verbose_stream() << "Satisfying soft constraints\n";
display_answer(verbose_stream());
});
DEBUG_CODE(if (is_sat == l_true) {
verify_assignment();
});
// TBD: check that all extensions are unsat too
DEBUG_CODE(if (is_sat == l_true) verify_assignment(););
return is_sat;
}