mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-04 13:21:22 +00:00
Code Activity

fix in rounding rows

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-04-18 23:13:39 -07:00
parent 2d12874f30
commit 7f12dfbbe8
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/util/lp/lar_solver.cpp
View file

@ -397,7 +397,7 @@ void lar_solver::pop(unsigned k) {
m_settings.simplex_strategy() = m_simplex_strategy; m_settings.simplex_strategy() = m_simplex_strategy;
lp_assert(sizes_are_correct()); lp_assert(sizes_are_correct());
lp_assert((!m_settings.use_tableau()) || m_mpq_lar_core_solver.m_r_solver.reduced_costs_are_correct_tableau()); lp_assert((!m_settings.use_tableau()) || m_mpq_lar_core_solver.m_r_solver.reduced_costs_are_correct_tableau());
lp_assert(m_cube_rounded_rows.size() != 0 || ax_is_correct()); lp_assert(ax_is_correct());
set_status(lp_status::UNKNOWN); set_status(lp_status::UNKNOWN);
} }
@ -875,8 +875,8 @@ void lar_solver::update_x_and_inf_costs_for_columns_with_changed_bounds_tableau(
} }
void lar_solver::fix_Ax_b_on_rounded_row(unsigned i) { void lar_solver::fix_Ax_b_on_rounded_row(unsigned i) {
if (A_r().m_rows[i].size() <= i) if (A_r().m_rows.size() <= i)
return; return;
unsigned bj = m_mpq_lar_core_solver.m_r_basis[i]; unsigned bj = m_mpq_lar_core_solver.m_r_basis[i];
auto& v = m_mpq_lar_core_solver.m_r_x[bj]; auto& v = m_mpq_lar_core_solver.m_r_x[bj];
v = zero_of_type<numeric_pair<mpq>>(); v = zero_of_type<numeric_pair<mpq>>();
@ -885,11 +885,28 @@ void lar_solver::fix_Ax_b_on_rounded_row(unsigned i) {
v -= c.coeff() * m_mpq_lar_core_solver.m_r_x[c.var()]; v -= c.coeff() * m_mpq_lar_core_solver.m_r_x[c.var()];
} }
} }
void lar_solver::collect_rounded_rows_to_fix() {
lp_assert(m_cube_rounded_rows.size() == 0);
for (unsigned j : m_cube_rounded_columns) {
if (j >= A_r().m_columns.size())
continue;
int j_raw = m_mpq_lar_core_solver.m_r_solver.m_basis_heading[j];
if (j_raw >= 0) {
m_cube_rounded_rows.insert(j_raw);
} else {
for (const auto & c : A_r().m_columns[j]) {
m_cube_rounded_rows.insert(c.var());
}
}
}
}
void lar_solver::fix_Ax_b_on_rounded_rows() { void lar_solver::fix_Ax_b_on_rounded_rows() {
collect_rounded_rows_to_fix();
for (unsigned i : m_cube_rounded_rows) { for (unsigned i : m_cube_rounded_rows) {
fix_Ax_b_on_rounded_row(i); fix_Ax_b_on_rounded_row(i);
} }
m_cube_rounded_rows.clear(); m_cube_rounded_rows.clear();
m_cube_rounded_columns.clear();
lp_assert(ax_is_correct()); lp_assert(ax_is_correct());
} }

4
src/util/lp/lar_solver.h
View file

@ -88,7 +88,8 @@ class lar_solver : public column_namer {
#endif #endif
//////////////////// fields ////////////////////////// //////////////////// fields //////////////////////////
vector<unsigned> m_cube_rounded_rows; std::unordered_set<unsigned> m_cube_rounded_columns;
std::unordered_set<unsigned> m_cube_rounded_rows;
lp_settings m_settings; lp_settings m_settings;
lp_status m_status; lp_status m_status;
stacked_value<simplex_strategy_enum> m_simplex_strategy; stacked_value<simplex_strategy_enum> m_simplex_strategy;
@ -639,5 +640,6 @@ public:
bool sum_first_coords(const lar_term& t, mpq & val) const; bool sum_first_coords(const lar_term& t, mpq & val) const;
void fix_Ax_b_on_rounded_rows(); void fix_Ax_b_on_rounded_rows();
void fix_Ax_b_on_rounded_row(unsigned); void fix_Ax_b_on_rounded_row(unsigned);
void collect_rounded_rows_to_fix();
}; };
} }