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

remove unused column function field, #1021

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-16 21:27:43 -07:00
parent ceec81de0b
commit 4069e76ab0
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,25 +34,24 @@ namespace lean {
class lar_solver : public column_namer { class lar_solver : public column_namer {
//////////////////// fields ////////////////////////// //////////////////// fields //////////////////////////
lp_settings m_settings; lp_settings m_settings;
stacked_value<lp_status> m_status; stacked_value<lp_status> m_status;
stacked_value<simplex_strategy_enum> m_simplex_strategy; stacked_value<simplex_strategy_enum> m_simplex_strategy;
std::unordered_map<unsigned, var_index> m_ext_vars_to_columns; std::unordered_map<unsigned, var_index> m_ext_vars_to_columns;
vector<unsigned> m_columns_to_ext_vars_or_term_indices; vector<unsigned> m_columns_to_ext_vars_or_term_indices;
stacked_vector<ul_pair> m_vars_to_ul_pairs; stacked_vector<ul_pair> m_vars_to_ul_pairs;
vector<lar_base_constraint*> m_constraints; vector<lar_base_constraint*> m_constraints;
stacked_value<unsigned> m_constraint_count; stacked_value<unsigned> m_constraint_count;
// the set of column indices j such that bounds have changed for j // the set of column indices j such that bounds have changed for j
int_set m_columns_with_changed_bound; int_set m_columns_with_changed_bound;
int_set m_rows_with_changed_bounds; int_set m_rows_with_changed_bounds;
int_set m_basic_columns_with_changed_cost; int_set m_basic_columns_with_changed_cost;
stacked_value<int> m_infeasible_column_index; // such can be found at the initialization step stacked_value<int> m_infeasible_column_index; // such can be found at the initialization step
stacked_value<unsigned> m_term_count; stacked_value<unsigned> m_term_count;
vector<lar_term*> m_terms; vector<lar_term*> m_terms;
vector<lar_term*> m_orig_terms; vector<lar_term*> m_orig_terms;
const var_index m_terms_start_index; const var_index m_terms_start_index;
indexed_vector<mpq> m_column_buffer; indexed_vector<mpq> m_column_buffer;
std::function<column_type (unsigned)> m_column_type_function;
public: public:
lar_core_solver m_mpq_lar_core_solver; lar_core_solver m_mpq_lar_core_solver;
unsigned constraint_count() const { unsigned constraint_count() const {
@ -83,7 +82,6 @@ public:
lar_solver() : m_status(OPTIMAL), lar_solver() : m_status(OPTIMAL),
m_infeasible_column_index(-1), m_infeasible_column_index(-1),
m_terms_start_index(1000000), m_terms_start_index(1000000),
m_column_type_function ([this] (unsigned j) {return m_mpq_lar_core_solver.m_column_types()[j];}),
m_mpq_lar_core_solver(m_settings, *this) m_mpq_lar_core_solver(m_settings, *this)
{} {}