mirror of
https://github.com/Z3Prover/z3
synced 2025-05-03 22:05:45 +00:00
rebase with master
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
parent
a19e10912f
commit
99538567a7
5 changed files with 18 additions and 17 deletions
|
@ -323,7 +323,7 @@ public:
|
|||
|
||||
m_dep = nullptr;
|
||||
for (auto c : *m_ex)
|
||||
m_dep = lia.lra.mk_join(lia.lra.dep_manager().mk_leaf(c.ci()), m_dep);
|
||||
m_dep = lia.lra.join_deps(lia.lra.dep_manager().mk_leaf(c.ci()), m_dep);
|
||||
|
||||
TRACE("gomory_cut_detail", dump_cut_and_constraints_as_smt_lemma(tout);
|
||||
lia.lra.display(tout));
|
||||
|
@ -470,10 +470,10 @@ public:
|
|||
if (!p.coeff().is_int()) continue;
|
||||
// the explanation for all above have been already added
|
||||
if (lia.at_lower(j))
|
||||
ret = lia.lra.dep_manager().mk_join(lia.column_lower_bound_constraint(j), ret);
|
||||
ret = lia.lra.join_deps(lia.column_lower_bound_constraint(j), ret);
|
||||
else {
|
||||
SASSERT(lia.at_upper(j));
|
||||
ret = lia.lra.dep_manager().mk_join(lia.column_upper_bound_constraint(j), ret);
|
||||
ret = lia.lra.join_deps(lia.column_upper_bound_constraint(j), ret);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue