mirror of
https://github.com/Z3Prover/z3
synced 2026-02-20 15:34:41 +00:00
merging master to unit_prop_on_monomials
This commit is contained in:
parent
a297a2b25c
commit
7de06c4350
19 changed files with 333 additions and 375 deletions
|
|
@ -253,7 +253,7 @@ namespace arith {
|
|||
first = false;
|
||||
reset_evidence();
|
||||
m_explanation.clear();
|
||||
be.explain_implied();
|
||||
lp().explain_implied_bound(be, m_bp);
|
||||
}
|
||||
CTRACE("arith", m_unassigned_bounds[v] == 0, tout << "missed bound\n";);
|
||||
updt_unassigned_bounds(v, -1);
|
||||
|
|
@ -1416,7 +1416,7 @@ namespace arith {
|
|||
}
|
||||
|
||||
void solver::assume_literals() {
|
||||
for (auto const& ineq : m_nla_literals) {
|
||||
for (auto const& ineq : m_nla->literals()) {
|
||||
auto lit = mk_ineq_literal(ineq);
|
||||
ctx.mark_relevant(lit);
|
||||
s().set_phase(lit);
|
||||
|
|
@ -1459,7 +1459,7 @@ namespace arith {
|
|||
return l_true;
|
||||
|
||||
m_a1 = nullptr; m_a2 = nullptr;
|
||||
lbool r = m_nla->check(m_nla_literals);
|
||||
lbool r = m_nla->check();
|
||||
switch (r) {
|
||||
case l_false:
|
||||
assume_literals();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue