mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-14 19:24:44 +00:00
Code Activity

trying randomly shuffle the indices in the slack utilization

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2025-05-09 12:47:35 -07:00
parent 1e5ceea4f5
commit 11a35d109b
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/math/lp/lar_solver.cpp
View file

@ -1476,26 +1476,33 @@ namespace lp {
const vector<std::pair<mpq, unsigned>>& inf_row, const vector<std::pair<mpq, unsigned>>& inf_row,
int inf_sign) const { int inf_sign) const {
#if 1
impq slack(0); impq slack(0);
std_vector<unsigned> indices;
for (auto& [coeff, j] : inf_row) { for (auto& [coeff, j] : inf_row) {
int adj_sign = coeff.is_pos() ? inf_sign : -inf_sign; int adj_sign = coeff.is_pos() ? inf_sign : -inf_sign;
slack += coeff * (adj_sign < 0 ? get_upper_bound(j) : get_lower_bound(j)); slack += coeff * (adj_sign < 0 ? get_upper_bound(j) : get_lower_bound(j));
indices.push_back(indices.size());
} }
#define get_sign(_x_) (_x_.is_pos() ? 1 : (_x_.is_neg() ? -1 : 0)) #define get_sign(_x_) (_x_.is_pos() ? 1 : (_x_.is_neg() ? -1 : 0))
int sign = get_sign(slack); int sign = get_sign(slack);
#endif for (unsigned j = indices.size(); j-- > 0; ) {
unsigned k = m_imp->m_settings.random_next(j+1);
if (k != j)
std::swap(indices[j], indices[k]);
}
for (auto& [coeff, j] : inf_row) { for (unsigned k : indices) {
const auto& p = inf_row[k];
unsigned j = p.second;
const mpq& coeff = p.first;
int adj_sign = coeff.is_pos() ? inf_sign : -inf_sign; int adj_sign = coeff.is_pos() ? inf_sign : -inf_sign;
bool is_upper = adj_sign < 0; bool is_upper = adj_sign < 0;
const column& ul = m_imp->m_columns[j]; const column& ul = m_imp->m_columns[j];
u_dependency* bound_constr_i = is_upper ? ul.upper_bound_witness() : ul.lower_bound_witness(); u_dependency* bound_constr_i = is_upper ? ul.upper_bound_witness() : ul.lower_bound_witness();
#if 1
if(is_upper) { if(is_upper) {
if (ul.previous_upper() != UINT_MAX) { if (ul.previous_upper() != UINT_MAX) {
auto const& [_is_upper, _j, _bound, _column] = m_imp->m_column_updates[ul.previous_upper()]; auto const& [_is_upper, _j, _bound, _column] = m_imp->m_column_updates[ul.previous_upper()];
@ -1518,8 +1525,7 @@ namespace lp {
} }
} }
} }
#endif
svector<constraint_index> deps; svector<constraint_index> deps;
dep_manager().linearize(bound_constr_i, deps); dep_manager().linearize(bound_constr_i, deps);
for (auto d : deps) { for (auto d : deps) {