From a9e2a1204ef5b589979cfdceed7f27fac83338a3 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Thu, 11 May 2017 16:58:29 -0700 Subject: [PATCH] add this qualifier for build Signed-off-by: Nikolaj Bjorner --- src/util/lp/lp_primal_core_solver.hpp | 14 +++++++------- src/util/lp/lp_primal_core_solver_tableau.hpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/util/lp/lp_primal_core_solver.hpp b/src/util/lp/lp_primal_core_solver.hpp index e31b3b7df..47eec468a 100644 --- a/src/util/lp/lp_primal_core_solver.hpp +++ b/src/util/lp/lp_primal_core_solver.hpp @@ -199,7 +199,7 @@ int lp_primal_core_solver::choose_entering_column_presize(unsigned number_ entering_iter = non_basis_iter; if (number_of_benefitial_columns_to_go_over) number_of_benefitial_columns_to_go_over--; - } else if (t == j_nz && m_settings.random_next() % 2 == 0) { + } else if (t == j_nz && this->m_settings.random_next() % 2 == 0) { entering_iter = non_basis_iter; } }// while (number_of_benefitial_columns_to_go_over && initial_offset_in_non_basis != offset_in_nb); @@ -268,7 +268,7 @@ template int lp_primal_core_solver::advance_on_so if (slope_at_entering * m_sign_of_entering_delta > - m_epsilon_of_reduced_cost) { // the slope started to increase infeasibility break; } else { - if ((numeric_traits::precise() == false) || ( numeric_traits::is_zero(slope_at_entering) && m_settings.random_next() % 2 == 0)) { + if ((numeric_traits::precise() == false) || ( numeric_traits::is_zero(slope_at_entering) && this->m_settings.random_next() % 2 == 0)) { // it is not cost benefitial to advance the delta more, so just break to increas the randomness break; } @@ -307,7 +307,7 @@ find_leaving_on_harris_theta(X const & harris_theta, X & t) { // we also know that harris_theta is limited, so we will find a leaving zero_harris_eps(); unsigned steps = this->m_ed.m_index.size(); - unsigned k = m_settings.random_next() % steps; + unsigned k = this->m_settings.random_next() % steps; unsigned initial_k = k; do { unsigned i = this->m_ed.m_index[k]; @@ -398,7 +398,7 @@ template int lp_primal_core_solver::find_leaving_ return find_leaving_and_t_with_breakpoints(entering, t); bool unlimited = true; unsigned steps = this->m_ed.m_index.size(); - unsigned k = m_settings.random_next() % steps; + unsigned k = this->m_settings.random_next() % steps; unsigned initial_k = k; unsigned row_min_nz = this->m_n() + 1; m_leaving_candidates.clear(); @@ -454,7 +454,7 @@ template int lp_primal_core_solver::find_leaving_ t = ratio; return entering; } - k = m_settings.random_next() % m_leaving_candidates.size(); + k = this->m_settings.random_next() % m_leaving_candidates.size(); return m_leaving_candidates[k]; } @@ -833,7 +833,7 @@ template unsigned lp_primal_core_solver::get_num if (ret == 0) { return 0; } - return std::max(static_cast(m_settings.random_next() % ret), 1u); + return std::max(static_cast(this->m_settings.random_next() % ret), 1u); } template void lp_primal_core_solver::print_column_norms(std::ostream & out) { @@ -961,7 +961,7 @@ template void lp_primal_core_solver::init_column_ for (unsigned j = 0; j < this->m_n(); j++) { this->m_column_norms[j] = T(static_cast(this->m_A.m_columns[j].size() + 1)) - + T(static_cast(m_settings.random_next() % 10000)) / T(100000); + + T(static_cast(this->m_settings.random_next() % 10000)) / T(100000); } } diff --git a/src/util/lp/lp_primal_core_solver_tableau.hpp b/src/util/lp/lp_primal_core_solver_tableau.hpp index 4b350dd43..0c09c22c9 100644 --- a/src/util/lp/lp_primal_core_solver_tableau.hpp +++ b/src/util/lp/lp_primal_core_solver_tableau.hpp @@ -62,7 +62,7 @@ template int lp_primal_core_solver::choose_enteri if (number_of_benefitial_columns_to_go_over) number_of_benefitial_columns_to_go_over--; } - else if (t == j_nz && m_settings.random_next() % 2 == 0) { + else if (t == j_nz && this->m_settings.random_next() % 2 == 0) { entering_iter = non_basis_iter; } }// while (number_of_benefitial_columns_to_go_over && initial_offset_in_non_basis != offset_in_nb); @@ -293,7 +293,7 @@ template int lp_primal_core_solver::find_leaving_ } if (m_leaving_candidates.size() == 1) return m_leaving_candidates[0]; - k = m_settings.random_next() % m_leaving_candidates.size(); + k = this->m_settings.random_next() % m_leaving_candidates.size(); return m_leaving_candidates[k]; } template void lp_primal_core_solver::init_run_tableau() {