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

rm lu

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2023-03-04 12:34:15 -08:00
parent a38be43264
commit 527f0d1242
4 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,6 @@ namespace lp {
delete t; delete t;
} }
bool lar_solver::use_lu() const { return false; }
bool lar_solver::sizes_are_correct() const { bool lar_solver::sizes_are_correct() const {
lp_assert(strategy_is_undecided() || !m_mpq_lar_core_solver.need_to_presolve_with_double_solver() || A_r().column_count() == A_d().column_count()); lp_assert(strategy_is_undecided() || !m_mpq_lar_core_solver.need_to_presolve_with_double_solver() || A_r().column_count() == A_d().column_count());
@ -1622,8 +1621,7 @@ namespace lp {
m_mpq_lar_core_solver.m_column_types.push_back(column_type::free_column); m_mpq_lar_core_solver.m_column_types.push_back(column_type::free_column);
increase_by_one_columns_with_changed_bounds(); increase_by_one_columns_with_changed_bounds();
add_new_var_to_core_fields_for_mpq(false); // false for not adding a row add_new_var_to_core_fields_for_mpq(false); // false for not adding a row
if (use_lu())
add_new_var_to_core_fields_for_doubles(false);
} }
void lar_solver::add_new_var_to_core_fields_for_doubles(bool register_in_basis) { void lar_solver::add_new_var_to_core_fields_for_doubles(bool register_in_basis) {
@ -1785,8 +1783,6 @@ namespace lp {
fill_last_row_of_A_r(A_r(), term); fill_last_row_of_A_r(A_r(), term);
} }
m_mpq_lar_core_solver.m_r_solver.update_x(j, get_basic_var_value_from_row(A_r().row_count() - 1)); m_mpq_lar_core_solver.m_r_solver.update_x(j, get_basic_var_value_from_row(A_r().row_count() - 1));
if (use_lu())
fill_last_row_of_A_d(A_d(), term);
for (lar_term::ival c : *term) { for (lar_term::ival c : *term) {
unsigned j = c.column(); unsigned j = c.column();
while (m_usage_in_terms.size() <= j) { while (m_usage_in_terms.size() <= j) {
@ -1798,15 +1794,12 @@ namespace lp {
} }
void lar_solver::add_basic_var_to_core_fields() { void lar_solver::add_basic_var_to_core_fields() {
bool use_lu = m_mpq_lar_core_solver.need_to_presolve_with_double_solver();
lp_assert(!use_lu || A_r().column_count() == A_d().column_count());
m_mpq_lar_core_solver.m_column_types.push_back(column_type::free_column); m_mpq_lar_core_solver.m_column_types.push_back(column_type::free_column);
increase_by_one_columns_with_changed_bounds(); increase_by_one_columns_with_changed_bounds();
m_incorrect_columns.increase_size_by_one(); m_incorrect_columns.increase_size_by_one();
m_rows_with_changed_bounds.increase_size_by_one(); m_rows_with_changed_bounds.increase_size_by_one();
add_new_var_to_core_fields_for_mpq(true); add_new_var_to_core_fields_for_mpq(true);
if (use_lu)
add_new_var_to_core_fields_for_doubles(true);
} }
bool lar_solver::bound_is_integer_for_integer_column(unsigned j, const mpq& right_side) const { bool lar_solver::bound_is_integer_for_integer_column(unsigned j, const mpq& right_side) const {

1
src/math/lp/lar_solver.h
View file

@ -166,7 +166,6 @@ class lar_solver : public column_namer {
void adjust_initial_state_for_lu(); void adjust_initial_state_for_lu();
void adjust_initial_state_for_tableau_rows(); void adjust_initial_state_for_tableau_rows();
void fill_last_row_of_A_d(static_matrix<double, double> & A, const lar_term* ls); void fill_last_row_of_A_d(static_matrix<double, double> & A, const lar_term* ls);
bool use_lu() const;
bool sizes_are_correct() const; bool sizes_are_correct() const;
bool implied_bound_is_correctly_explained(implied_bound const & be, const vector<std::pair<mpq, unsigned>> & explanation) const; bool implied_bound_is_correctly_explained(implied_bound const & be, const vector<std::pair<mpq, unsigned>> & explanation) const;

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

@ -82,8 +82,7 @@ allocate_basis_heading() { // the rest of initialization will be handled by the
template <typename T, typename X> void lp_core_solver_base<T, X>:: template <typename T, typename X> void lp_core_solver_base<T, X>::
init() { init() {
allocate_basis_heading(); allocate_basis_heading();
if (m_settings.use_lu())
init_factorization(m_factorization, m_A, m_basis, m_settings);
} }
// i is the pivot row, and j is the pivot column // i is the pivot row, and j is the pivot column

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

@ -339,9 +339,6 @@ public:
m_simplex_strategy = s; m_simplex_strategy = s;
} }
bool use_lu() const {
return false;
}
bool use_tableau() const { bool use_tableau() const {
return true; return true;