mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

fix build warnings part 6

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-11 08:57:17 -07:00
parent f176e1e5e5
commit 49d2b86d35
6 changed files with 56 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/util/lp/lp_core_solver_base.hpp
View file

@ -24,6 +24,7 @@ lp_core_solver_base(static_matrix<T, X> & A,
const vector<X> & upper_bound_values): const vector<X> & upper_bound_values):
m_status(FEASIBLE), m_status(FEASIBLE),
m_inf_set(A.column_count()), m_inf_set(A.column_count()),
m_using_infeas_costs(false),
m_pivot_row_of_B_1(A.row_count()), m_pivot_row_of_B_1(A.row_count()),
m_pivot_row(A.column_count()), m_pivot_row(A.column_count()),
m_A(A), m_A(A),
@ -45,14 +46,14 @@ lp_core_solver_base(static_matrix<T, X> & A,
m_upper_bounds(upper_bound_values), m_upper_bounds(upper_bound_values),
m_column_norms(m_n()), m_column_norms(m_n()),
m_copy_of_xB(m_m()), m_copy_of_xB(m_m()),
m_steepest_edge_coefficients(A.column_count()),
m_total_iterations(0),
m_using_infeas_costs(false),
m_iters_with_no_cost_growing(0),
m_basis_sort_counter(0), m_basis_sort_counter(0),
m_steepest_edge_coefficients(A.column_count()),
m_tracing_basis_changes(false), m_tracing_basis_changes(false),
m_pivoted_rows(nullptr), m_pivoted_rows(nullptr),
m_look_for_feasible_solution_only(false) { m_look_for_feasible_solution_only(false),
m_total_iterations(0),
m_iters_with_no_cost_growing(0)
{
lean_assert(bounds_for_boxed_are_set_correctly()); lean_assert(bounds_for_boxed_are_set_correctly());
init(); init();
init_basis_heading_and_non_basic_columns_vector(); init_basis_heading_and_non_basic_columns_vector();

4
src/util/lp/lu.hpp
View file

@ -111,6 +111,7 @@ template <typename T, typename X>
lu<T, X>::lu(static_matrix<T, X> const & A, lu<T, X>::lu(static_matrix<T, X> const & A,
vector<unsigned>& basis, vector<unsigned>& basis,
lp_settings & settings): lp_settings & settings):
m_status(LU_status::OK),
m_dim(A.row_count()), m_dim(A.row_count()),
m_A(A), m_A(A),
m_Q(m_dim), m_Q(m_dim),
@ -118,9 +119,8 @@ lu<T, X>::lu(static_matrix<T, X> const & A,
m_r_wave(m_dim), m_r_wave(m_dim),
m_U(A, basis), // create the square matrix that eventually will be factorized m_U(A, basis), // create the square matrix that eventually will be factorized
m_settings(settings), m_settings(settings),
m_row_eta_work_vector(A.row_count()),
m_status(LU_status::OK),
m_failure(false), m_failure(false),
m_row_eta_work_vector(A.row_count()),
m_refactor_counter(0) { m_refactor_counter(0) {
lean_assert(!(numeric_traits<T>::precise() && settings.use_tableau())); lean_assert(!(numeric_traits<T>::precise() && settings.use_tableau()));
#ifdef LEAN_DEBUG #ifdef LEAN_DEBUG

4
src/util/lp/sparse_matrix.hpp
View file

@ -36,12 +36,12 @@ void sparse_matrix<T, X>::copy_B(static_matrix<T, X> const &A, vector<unsigned>
// constructor that copies columns of the basis from A // constructor that copies columns of the basis from A
template <typename T, typename X> template <typename T, typename X>
sparse_matrix<T, X>::sparse_matrix(static_matrix<T, X> const &A, vector<unsigned> & basis) : sparse_matrix<T, X>::sparse_matrix(static_matrix<T, X> const &A, vector<unsigned> & basis) :
m_n_of_active_elems(0),
m_pivot_queue(A.row_count()), m_pivot_queue(A.row_count()),
m_row_permutation(A.row_count()), m_row_permutation(A.row_count()),
m_column_permutation(A.row_count()), m_column_permutation(A.row_count()),
m_work_pivot_vector(A.row_count(), -1), m_work_pivot_vector(A.row_count(), -1),
m_processed(A.row_count()), m_processed(A.row_count()) {
m_n_of_active_elems(0) {
init_row_headers(); init_row_headers();
init_column_headers(); init_column_headers();
copy_B(A, basis); copy_B(A, basis);