mirror of
https://github.com/Z3Prover/z3
synced 2025-04-08 18:31:49 +00:00
use appropriate MaxSAT solver even if there are no soft constraints. Also avoid PB constraints when all soft constraints are false. Reported by Klaus Becker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
b19fbe4429
commit
653416153d
|
@ -188,6 +188,7 @@ public:
|
|||
}
|
||||
|
||||
lbool mus_solver() {
|
||||
lbool is_sat = l_true;
|
||||
init();
|
||||
init_local();
|
||||
trace();
|
||||
|
@ -198,7 +199,7 @@ public:
|
|||
tout << "\n";
|
||||
display(tout);
|
||||
);
|
||||
lbool is_sat = check_sat_hill_climb(m_asms);
|
||||
is_sat = check_sat_hill_climb(m_asms);
|
||||
if (m_cancel) {
|
||||
return l_undef;
|
||||
}
|
||||
|
@ -833,9 +834,7 @@ public:
|
|||
s().assert_expr(m_asms[i].get());
|
||||
}
|
||||
}
|
||||
else {
|
||||
maxsmt_solver_base::commit_assignment();
|
||||
}
|
||||
// else: there is only a single assignment to these soft constraints.
|
||||
}
|
||||
|
||||
void verify_core(exprs const& core) {
|
||||
|
|
|
@ -159,12 +159,7 @@ namespace opt {
|
|||
symbol const& maxsat_engine = m_c.maxsat_engine();
|
||||
IF_VERBOSE(1, verbose_stream() << "(maxsmt)\n";);
|
||||
TRACE("opt", tout << "maxsmt\n";);
|
||||
if (m_soft_constraints.empty()) {
|
||||
TRACE("opt", tout << "no constraints\n";);
|
||||
m_msolver = 0;
|
||||
is_sat = s().check_sat(0, 0);
|
||||
}
|
||||
else if (maxsat_engine == symbol("maxres")) {
|
||||
if (m_soft_constraints.empty() || maxsat_engine == symbol("maxres")) {
|
||||
m_msolver = mk_maxres(m_c, m_weights, m_soft_constraints);
|
||||
}
|
||||
else if (maxsat_engine == symbol("pd-maxres")) {
|
||||
|
|
Loading…
Reference in a new issue