Module: ppl/ppl Branch: master Commit: e08bd14506912121a1c188ecbb337e82ec6534c8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e08bd14506912...

Author: Abramo Bagnara abramo.bagnara@gmail.com Date: Sun Feb 26 15:28:06 2012 +0100

Removed redundant and unused stuff.

---

src/CO_Tree.defs.hh | 2 -- src/MIP_Problem.cc | 27 +-------------------------- 2 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/src/CO_Tree.defs.hh b/src/CO_Tree.defs.hh index 0a84211..cba1e10 100644 --- a/src/CO_Tree.defs.hh +++ b/src/CO_Tree.defs.hh @@ -145,8 +145,6 @@ public: typedef Coefficient data_type; typedef Coefficient_traits::const_reference data_type_const_reference;

- class iterator; - //! A const %iterator on the tree elements, ordered by key. /*! Iterator increment and decrement operations are \f$O(1)\f$ time. diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 9eb8022..66c9978 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -644,29 +644,6 @@ PPL::MIP_Problem return true; }

-namespace { - -// This is used as a template argument in process_pending_constraints(), -// so it must be a global declaration. -struct process_pending_constraints_helper_struct { - - PPL::dimension_type index; - const PPL::Coefficient* data; - bool toggle_sign; - - process_pending_constraints_helper_struct(PPL::dimension_type index1, - const PPL::Coefficient* data1, - bool toggle_sign1) - : index(index1), data(data1), toggle_sign(toggle_sign1) { - } - - bool operator<(const process_pending_constraints_helper_struct& x) const { - return index < x.index; - } -}; - -} // namespace - bool PPL::MIP_Problem::process_pending_constraints() { // Check the pending constraints to adjust the data structures. @@ -791,8 +768,6 @@ PPL::MIP_Problem::process_pending_constraints() { ? artificial_index : 0;

- typedef process_pending_constraints_helper_struct buffer_element_t; - // Proceed with the insertion of the constraints. for (dimension_type k = tableau_num_rows, i = input_cs.size() - first_pending_constraint; i-- > 0; ) { @@ -2390,7 +2365,7 @@ PPL::MIP_Problem::OK() const { for (dimension_type i = base.size(); i-- > 0; ) vars_in_base.push_back(std::make_pair(base[i], i));

- std::sort(vars_in_base.begin(),vars_in_base.end()); + std::sort(vars_in_base.begin(), vars_in_base.end());

for (dimension_type j = tableau_num_rows; j-- > 0; ) { const Row& tableau_j = tableau[j];