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

Merge pull request #286 from NikolajBjorner/master

Browse source 
Fixes to MaxSAT, add checks for incorrect use of internalizer API
This commit is contained in:
Nikolaj Bjorner 2015-11-02 08:25:23 -08:00
commit fb0999b3cf
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/opt/maxres.cpp
View file

@ -188,6 +188,7 @@ public:
} }
lbool mus_solver() { lbool mus_solver() {
lbool is_sat = l_true;
init(); init();
init_local(); init_local();
trace(); trace();
@ -198,7 +199,7 @@ public:
tout << "\n"; tout << "\n";
display(tout); display(tout);
); );
lbool is_sat = check_sat_hill_climb(m_asms); is_sat = check_sat_hill_climb(m_asms);
if (m_cancel) { if (m_cancel) {
return l_undef; return l_undef;
} }
@ -833,9 +834,7 @@ public:
s().assert_expr(m_asms[i].get()); s().assert_expr(m_asms[i].get());
} }
} }
else { // else: there is only a single assignment to these soft constraints.
maxsmt_solver_base::commit_assignment();
}
} }
void verify_core(exprs const& core) { void verify_core(exprs const& core) {

7
src/opt/maxsmt.cpp
View file

@ -159,12 +159,7 @@ namespace opt {
symbol const& maxsat_engine = m_c.maxsat_engine(); symbol const& maxsat_engine = m_c.maxsat_engine();
IF_VERBOSE(1, verbose_stream() << "(maxsmt)\n";); IF_VERBOSE(1, verbose_stream() << "(maxsmt)\n";);
TRACE("opt", tout << "maxsmt\n";); TRACE("opt", tout << "maxsmt\n";);
if (m_soft_constraints.empty()) { if (m_soft_constraints.empty() || maxsat_engine == symbol("maxres")) {
TRACE("opt", tout << "no constraints\n";);
m_msolver = 0;
is_sat = s().check_sat(0, 0);
}
else if (maxsat_engine == symbol("maxres")) {
m_msolver = mk_maxres(m_c, m_weights, m_soft_constraints); m_msolver = mk_maxres(m_c, m_weights, m_soft_constraints);
} }
else if (maxsat_engine == symbol("pd-maxres")) { else if (maxsat_engine == symbol("pd-maxres")) {

8
src/smt/smt_internalizer.cpp
View file

@ -617,7 +617,15 @@ namespace smt {
mk_ite_cnstr(to_app(n)); mk_ite_cnstr(to_app(n));
add_ite_rel_watches(to_app(n)); add_ite_rel_watches(to_app(n));
break; break;
case OP_TRUE:
case OP_FALSE:
break;
case OP_DISTINCT: case OP_DISTINCT:
case OP_IMPLIES:
case OP_XOR:
UNREACHABLE();
case OP_OEQ:
case OP_INTERP:
UNREACHABLE(); UNREACHABLE();
default: default:
break; break;