mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-21 05:13:39 +00:00
Code Activity

fix none-case

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-09-04 15:46:10 -07:00
parent 9ad17296c2
commit f53b7aaca2
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/sat/ba_solver.cpp
View file

@ -1607,7 +1607,7 @@ namespace sat {
} }
else { else {
round_to_one(consequent.var()); round_to_one(consequent.var());
if (cnstr.tag() == pb_t) round_to_one(m_A, consequent.var()); if (cnstr.is_pb()) round_to_one(m_A, consequent.var());
SASSERT(validate_ineq(m_A)); SASSERT(validate_ineq(m_A));
resolve_with(m_A); resolve_with(m_A);
} }
@ -1629,8 +1629,7 @@ namespace sat {
mark_visited(v); mark_visited(v);
if (s().is_marked(v)) { if (s().is_marked(v)) {
int64_t c = get_coeff(v); int64_t c = get_coeff(v);
if (c == 0) { if (c == 0 || (c < 0 == consequent.sign())) {
CTRACE("ba", c != 0, active2pb(m_A); display(tout << consequent << ": ", m_A, true););
s().reset_mark(v); s().reset_mark(v);
--m_num_marks; --m_num_marks;
} }

2
src/sat/sat_config.cpp
View file

@ -202,7 +202,7 @@ namespace sat {
else if (s == "rounding") else if (s == "rounding")
m_pb_resolve = PB_ROUNDING; m_pb_resolve = PB_ROUNDING;
else else
throw sat_param_exception("invalid PB resolve: 'cardinality' or 'resolve' expected"); throw sat_param_exception("invalid PB resolve: 'cardinality' or 'rounding' expected");
s = p.pb_lemma_format(); s = p.pb_lemma_format();
if (s == "cardinality") if (s == "cardinality")