mirror of
https://github.com/Z3Prover/z3
synced 2025-08-21 02:30:23 +00:00
get rid of int*, use lambda scoping
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner
parent
7a74b099ba
commit
615aad7779
5 changed files with 55 additions and 56 deletions
|
|
@ -140,22 +140,24 @@ public:
|
|||
}
|
||||
|
||||
void add_bounds_for_zero_var(lpvar monic_var, lpvar zero_var) {
|
||||
auto lambda = [zero_var](int* s) {
|
||||
return ((lp_bound_propagator*)s)->lp().get_bound_constraint_witnesses_for_column(zero_var);
|
||||
auto& lps = lp();
|
||||
auto lambda = [zero_var,&lps]() {
|
||||
return lps.get_bound_constraint_witnesses_for_column(zero_var);
|
||||
};
|
||||
TRACE("add_bound", lp().print_column_info(zero_var, tout) << std::endl;);
|
||||
add_lower_bound_monic(monic_var, mpq(0), false, lambda);
|
||||
add_upper_bound_monic(monic_var, mpq(0), false, lambda);
|
||||
}
|
||||
|
||||
void add_lower_bound_monic(lpvar j, const mpq& v, bool is_strict, std::function<u_dependency* (int*)> explain_dep) {
|
||||
void add_lower_bound_monic(lpvar j, const mpq& v, bool is_strict, std::function<u_dependency*()> explain_dep) {
|
||||
TRACE("add_bound", lp().print_column_info(j, tout) << std::endl;);
|
||||
j = lp().column_to_reported_index(j);
|
||||
unsigned k;
|
||||
if (!m_improved_lower_bounds.find(j, k)) {
|
||||
m_improved_lower_bounds.insert(j,static_cast<unsigned>(m_ibounds.size()));
|
||||
m_ibounds.push_back(implied_bound(v, j, true, is_strict, explain_dep));
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
auto& found_bound = m_ibounds[k];
|
||||
if (v > found_bound.m_bound || (v == found_bound.m_bound && !found_bound.m_strict && is_strict)) {
|
||||
found_bound = implied_bound(v, j, true, is_strict, explain_dep);
|
||||
|
|
@ -164,13 +166,14 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
void add_upper_bound_monic(lpvar j, const mpq& bound_val, bool is_strict, std::function <u_dependency* (int*)> explain_bound) {
|
||||
void add_upper_bound_monic(lpvar j, const mpq& bound_val, bool is_strict, std::function <u_dependency* ()> explain_bound) {
|
||||
j = lp().column_to_reported_index(j);
|
||||
unsigned k;
|
||||
if (!m_improved_upper_bounds.find(j, k)) {
|
||||
m_improved_upper_bounds.insert(j, static_cast<unsigned>(m_ibounds.size()));
|
||||
m_ibounds.push_back(implied_bound(bound_val, j, false, is_strict, explain_bound));
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
auto& found_bound = m_ibounds[k];
|
||||
if (bound_val > found_bound.m_bound || (bound_val == found_bound.m_bound && !found_bound.m_strict && is_strict)) {
|
||||
found_bound = implied_bound(bound_val, j, false, is_strict, explain_bound);
|
||||
|
|
@ -204,18 +207,16 @@ public:
|
|||
void propagate_monic_with_non_fixed(lpvar monic_var, const svector<lpvar>& vars, lpvar non_fixed, const rational& k) {
|
||||
lp::impq bound_value;
|
||||
bool is_strict;
|
||||
auto& lps = lp();
|
||||
|
||||
if (lower_bound_is_available(non_fixed)) {
|
||||
bound_value = lp().column_lower_bound(non_fixed);
|
||||
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));
|
||||
}
|
||||
}
|
||||
auto lambda = [vars, non_fixed,&lps]() {
|
||||
u_dependency* dep = lps.get_column_lower_bound_witness(non_fixed);
|
||||
for (auto v : vars)
|
||||
if (v != non_fixed)
|
||||
dep = lps.join_deps(dep, lps.get_bound_constraint_witnesses_for_column(v));
|
||||
return dep;
|
||||
};
|
||||
if (k.is_pos())
|
||||
|
|
@ -227,14 +228,11 @@ public:
|
|||
if (upper_bound_is_available(non_fixed)) {
|
||||
bound_value = lp().column_upper_bound(non_fixed);
|
||||
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));
|
||||
}
|
||||
}
|
||||
auto lambda = [vars, non_fixed,&lps]() {
|
||||
u_dependency* dep = lps.get_column_upper_bound_witness(non_fixed);
|
||||
for (auto v : vars)
|
||||
if (v != non_fixed)
|
||||
dep = lps.join_deps(dep, lps.get_bound_constraint_witnesses_for_column(v));
|
||||
return dep;
|
||||
};
|
||||
if (k.is_neg())
|
||||
|
|
@ -244,33 +242,31 @@ public:
|
|||
}
|
||||
|
||||
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);
|
||||
is_strict = !bound_value.y.is_zero();
|
||||
if (k.is_pos())
|
||||
add_lower_bound_monic(non_fixed, bound_value.x / k, is_strict, lambda);
|
||||
else
|
||||
add_upper_bound_monic(non_fixed, bound_value.x / k, is_strict, lambda);
|
||||
auto lambda = [vars, monic_var, non_fixed,&lps]() {
|
||||
u_dependency* dep = lps.get_column_lower_bound_witness(monic_var);
|
||||
for (auto v : vars) {
|
||||
if (v != non_fixed) {
|
||||
dep = lps.join_deps(dep, lps.get_bound_constraint_witnesses_for_column(v));
|
||||
}
|
||||
}
|
||||
return dep;
|
||||
};
|
||||
bound_value = lp().column_lower_bound(monic_var);
|
||||
is_strict = !bound_value.y.is_zero();
|
||||
if (k.is_pos())
|
||||
add_lower_bound_monic(non_fixed, bound_value.x / k, is_strict, lambda);
|
||||
else
|
||||
add_upper_bound_monic(non_fixed, bound_value.x / k, is_strict, lambda);
|
||||
}
|
||||
|
||||
|
||||
if (upper_bound_is_available(monic_var)) {
|
||||
bound_value = lp().column_upper_bound(monic_var);
|
||||
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);
|
||||
auto lambda = [vars, monic_var, non_fixed,&lps]() {
|
||||
u_dependency* dep = lps.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));
|
||||
dep = lps.join_deps(dep, lps.get_bound_constraint_witnesses_for_column(v));
|
||||
}
|
||||
}
|
||||
return dep;
|
||||
|
|
@ -283,9 +279,10 @@ public:
|
|||
}
|
||||
|
||||
void propagate_monic_with_all_fixed(lpvar monic_var, const svector<lpvar>& vars, const rational& k) {
|
||||
auto lambda = [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);
|
||||
auto& lps = lp();
|
||||
auto lambda = [vars,&lps]() { return lps.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);
|
||||
}
|
||||
|
||||
column_type get_column_type(unsigned j) const {
|
||||
|
|
@ -313,7 +310,7 @@ public:
|
|||
return (*m_column_types)[j] == column_type::fixed && get_lower_bound(j).y.is_zero();
|
||||
}
|
||||
|
||||
void add_bound(mpq const& v, unsigned j, bool is_low, bool strict, std::function<u_dependency* (int*)> explain_bound) {
|
||||
void add_bound(mpq const& v, unsigned j, bool is_low, bool strict, std::function<u_dependency* ()> explain_bound) {
|
||||
j = lp().column_to_reported_index(j);
|
||||
|
||||
lconstraint_kind kind = is_low ? GE : LE;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue