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

Merge branch 'master' of https://github.com/z3prover/z3

Browse source
This commit is contained in:
Nikolaj Bjorner 2018-04-27 17:49:51 +02:00
parent f234bb348b a9568d1b12
commit c64d044e60
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/opt/wmax.cpp
View file

@ -84,6 +84,9 @@ namespace opt {
if (m.canceled()) { if (m.canceled()) {
is_sat = l_undef; is_sat = l_undef;
} }
if (is_sat == l_undef) {
break;
}
if (is_sat == l_false) { if (is_sat == l_false) {
TRACE("opt", tout << "Unsat\n";); TRACE("opt", tout << "Unsat\n";);
break; break;
@ -97,9 +100,6 @@ namespace opt {
//DEBUG_CODE(verify_cores(cores);); //DEBUG_CODE(verify_cores(cores););
s().assert_expr(fml); s().assert_expr(fml);
} }
else {
//DEBUG_CODE(verify_cores(cores););
}
update_cores(wth(), cores); update_cores(wth(), cores);
wth().init_min_cost(m_upper - m_lower); wth().init_min_cost(m_upper - m_lower);
trace_bounds("wmax"); trace_bounds("wmax");

2
src/smt/theory_str.cpp
View file

@ -8096,7 +8096,7 @@ namespace smt {
rational nn1Len, nn2Len; rational nn1Len, nn2Len;
bool nn1Len_exists = get_len_value(lhs, nn1Len); bool nn1Len_exists = get_len_value(lhs, nn1Len);
bool nn2Len_exists = get_len_value(rhs, nn2Len); bool nn2Len_exists = get_len_value(rhs, nn2Len);
expr * emptyStr = mk_string(""); expr_ref emptyStr(mk_string(""), m);
if (nn1Len_exists && nn1Len.is_zero()) { if (nn1Len_exists && nn1Len.is_zero()) {
if (!in_same_eqc(lhs, emptyStr) && rhs != emptyStr) { if (!in_same_eqc(lhs, emptyStr) && rhs != emptyStr) {