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

fix dep calculations in lp_bound_propagator

Browse source
This commit is contained in:
Lev Nachmanson 2023-09-17 06:48:12 -07:00
parent 77e56b0a69
commit 7353d7fb4d
2 changed files with 52 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/math/lp/bound_analyzer_on_row.h
View file

@ -324,8 +324,7 @@ private:
int bound_sign = (is_lower_bound ? 1 : -1); int bound_sign = (is_lower_bound ? 1 : -1);
int j_sign = (coeff_before_j_is_pos ? 1 : -1) * bound_sign; int j_sign = (coeff_before_j_is_pos ? 1 : -1) * bound_sign;
if (tv::is_term(bound_j)) SASSERT(!tv::is_term(bound_j));
bound_j = lar.map_term_index_to_column_index(bound_j);
u_dependency* ret = nullptr; u_dependency* ret = nullptr;
for (auto const& r : lar.get_row(row_index)) { for (auto const& r : lar.get_row(row_index)) {
unsigned j = r.var(); unsigned j = r.var();

61
src/math/lp/lp_bound_propagator.h
View file

@ -198,42 +198,83 @@ private:
if (lower_bound_is_available(non_fixed)) { if (lower_bound_is_available(non_fixed)) {
bound_value = lp().column_lower_bound(non_fixed); bound_value = lp().column_lower_bound(non_fixed);
is_strict = !bound_value.y.is_zero(); is_strict = !bound_value.y.is_zero();
auto lambda = [vars, non_fixed](int* s) {
auto& l = ((lp_bound_propagator*)s)->lp();
u_dependency* dep = l.get_column_lower_bound_witness(non_fixed);
for (auto v : vars) {
if (v != non_fixed) {
dep = l.join_deps(dep, l.get_bound_constraint_witnesses_for_column(v));
}
}
return dep;
};
if (k.is_pos()) if (k.is_pos())
add_lower_bound_monic(monic_var, k * bound_value.x, is_strict , [non_fixed](int* s) { return ((lp_bound_propagator*)s)->lp().get_column_lower_bound_witness(non_fixed); }); add_lower_bound_monic(monic_var, k * bound_value.x, is_strict , lambda);
else else
add_upper_bound_monic(monic_var, k * bound_value.x, is_strict, [non_fixed](int* s) {return ((lp_bound_propagator*)s)->lp().get_column_lower_bound_witness(non_fixed);}); add_upper_bound_monic(monic_var, k * bound_value.x, is_strict, lambda);
} }
if (upper_bound_is_available(non_fixed)) { if (upper_bound_is_available(non_fixed)) {
bound_value = lp().column_upper_bound(non_fixed); bound_value = lp().column_upper_bound(non_fixed);
is_strict = !bound_value.y.is_zero(); is_strict = !bound_value.y.is_zero();
auto lambda = [vars, non_fixed](int* s) {
auto& l = ((lp_bound_propagator*)s)->lp();
u_dependency* dep = l.get_column_upper_bound_witness(non_fixed);
for (auto v : vars) {
if (v != non_fixed) {
dep = l.join_deps(dep, l.get_bound_constraint_witnesses_for_column(v));
}
}
return dep;
};
if (k.is_neg()) if (k.is_neg())
add_lower_bound_monic(monic_var, k * bound_value.x, is_strict, [non_fixed](int* s) {return ((lp_bound_propagator*)s)->lp().get_column_upper_bound_witness(non_fixed);}); add_lower_bound_monic(monic_var, k * bound_value.x, is_strict, lambda);
else else
add_upper_bound_monic(monic_var, k * bound_value.x, is_strict, [non_fixed](int* s) {return ((lp_bound_propagator*)s)->lp().get_column_upper_bound_witness(non_fixed);}); add_upper_bound_monic(monic_var, k * bound_value.x, is_strict, lambda);
} }
if (lower_bound_is_available(monic_var)) { if (lower_bound_is_available(monic_var)) {
auto lambda = [vars, monic_var, non_fixed](int* s) {
auto& l = ((lp_bound_propagator*)s)->lp();
u_dependency* dep = l.get_column_lower_bound_witness(monic_var);
for (auto v : vars) {
if (v != non_fixed) {
dep = l.join_deps(dep, l.get_bound_constraint_witnesses_for_column(v));
}
}
return dep;
};
bound_value = lp().column_lower_bound(monic_var); bound_value = lp().column_lower_bound(monic_var);
is_strict = !bound_value.y.is_zero(); is_strict = !bound_value.y.is_zero();
if (k.is_pos()) if (k.is_pos())
add_lower_bound_monic(non_fixed, bound_value.x / k, is_strict, [monic_var](int* s) {return ((lp_bound_propagator*)s)->lp().get_column_lower_bound_witness(monic_var);}); add_lower_bound_monic(non_fixed, bound_value.x / k, is_strict, lambda);
else else
add_upper_bound_monic(non_fixed, bound_value.x / k, is_strict, [monic_var](int* s) {return ((lp_bound_propagator*)s)->lp().get_column_lower_bound_witness(monic_var);}); add_upper_bound_monic(non_fixed, bound_value.x / k, is_strict, lambda);
} }
if (upper_bound_is_available(monic_var)) { if (upper_bound_is_available(monic_var)) {
bound_value = lp().column_upper_bound(monic_var); bound_value = lp().column_upper_bound(monic_var);
is_strict = !bound_value.y.is_zero(); is_strict = !bound_value.y.is_zero();
auto lambda = [vars, monic_var, non_fixed](int* s) {
auto& l = ((lp_bound_propagator*)s)->lp();
u_dependency* dep = l.get_column_upper_bound_witness(monic_var);
for (auto v : vars) {
if (v != non_fixed) {
dep = l.join_deps(dep, l.get_bound_constraint_witnesses_for_column(v));
}
}
return dep;
};
if (k.is_neg()) if (k.is_neg())
add_lower_bound_monic(non_fixed, bound_value.x / k, is_strict, [monic_var](int* s) {return ((lp_bound_propagator*)s)->lp().get_column_upper_bound_witness(monic_var);}); add_lower_bound_monic(non_fixed, bound_value.x / k, is_strict, lambda);
else else
add_upper_bound_monic(non_fixed, bound_value.x / k, is_strict, [monic_var](int* s) {return ((lp_bound_propagator*)s)->lp().get_column_upper_bound_witness(monic_var);}); add_upper_bound_monic(non_fixed, bound_value.x / k, is_strict, lambda);
} }
} else { // all variables are fixed } else { // all variables are fixed
add_lower_bound_monic(monic_var, k, false, [vars](int* s){return ((lp_bound_propagator*)s)->lp().get_bound_constraint_witnesses_for_columns(vars);}); auto lambda = [vars](int* s){return ((lp_bound_propagator*)s)->lp().get_bound_constraint_witnesses_for_columns(vars);};
add_upper_bound_monic(monic_var, k, false, [vars](int* s){return ((lp_bound_propagator*)s)->lp().get_bound_constraint_witnesses_for_columns(vars);}); add_lower_bound_monic(monic_var, k, false, lambda);
add_upper_bound_monic(monic_var, k, false, lambda);
} }
} }
} }