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

add dependencies only for fixed variablse in add_row_to_pdd_grobner()

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-01-02 12:01:01 -08:00
parent 8ed22c77aa
commit ca9ed38ff5
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/math/lp/nla_core.cpp
View file

@ -1538,13 +1538,11 @@ void core::add_var_and_its_factors_to_q_and_collect_new_rows(lpvar j, svector<lp
dd::pdd core::pdd_expr(const rational& c, lpvar j, u_dependency*& dep) { dd::pdd core::pdd_expr(const rational& c, lpvar j, u_dependency*& dep) {
unsigned lc, uc;
m_lar_solver.get_bound_constraint_witnesses_for_column(j, lc, uc);
if (lc != null_lpvar)
dep = m_intervals.mk_join(dep, m_intervals.mk_leaf(lc));
if (uc != null_lpvar)
dep = m_intervals.mk_join(dep, m_intervals.mk_leaf(uc));
if (var_is_fixed(j)) { if (var_is_fixed(j)) {
unsigned lc, uc;
m_lar_solver.get_bound_constraint_witnesses_for_column(j, lc, uc);
dep = m_intervals.mk_join(dep, m_intervals.mk_leaf(lc));
dep = m_intervals.mk_join(dep, m_intervals.mk_leaf(uc));
return m_pdd_manager.mk_val(c * m_lar_solver.column_lower_bound(j).x); return m_pdd_manager.mk_val(c * m_lar_solver.column_lower_bound(j).x);
} }
@ -1556,6 +1554,7 @@ dd::pdd core::pdd_expr(const rational& c, lpvar j, u_dependency*& dep) {
const monic& m = emons()[j]; const monic& m = emons()[j];
for (lpvar k : m.vars()) { for (lpvar k : m.vars()) {
if (var_is_fixed(k)) { if (var_is_fixed(k)) {
unsigned lc, uc;
r *= m_pdd_manager.mk_val(m_lar_solver.column_lower_bound(k).x); r *= m_pdd_manager.mk_val(m_lar_solver.column_lower_bound(k).x);
m_lar_solver.get_bound_constraint_witnesses_for_column(k, lc, uc); m_lar_solver.get_bound_constraint_witnesses_for_column(k, lc, uc);
dep = m_intervals.mk_join(dep, m_intervals.mk_leaf(lc)); dep = m_intervals.mk_join(dep, m_intervals.mk_leaf(lc));