[GIT] ppl/ppl(sparse_matrices): Unlimited_Sparse_Row, Sparse_Row, Sparse_Row_Reference: remove useless upper_bound() methods.

19 Mar 2010

Module: ppl/ppl
Branch: sparse_matrices
Commit: 5e39d1a88965c86d3be7f6f3310fb61f88bdf4fc
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5e39d1a88965c...
Author: Marco Poletti poletti.marco@gmail.com
Date:   Thu Mar 18 15:44:17 2010 +0100
Unlimited_Sparse_Row, Sparse_Row, Sparse_Row_Reference: remove useless upper_bound() methods.
---
src/Sparse_Row.defs.hh              |    6 ----
 src/Sparse_Row.inlines.hh           |   25 ---------------
 src/Unlimited_Sparse_Row.defs.hh    |   10 ------
 src/Unlimited_Sparse_Row.inlines.hh |   57 -----------------------------------
 4 files changed, 0 insertions(+), 98 deletions(-)

diff --git a/src/Sparse_Row.defs.hh b/src/Sparse_Row.defs.hh
index 8381250..d72b0d6 100644
--- a/src/Sparse_Row.defs.hh
+++ b/src/Sparse_Row.defs.hh
@@ -165,13 +165,10 @@ public:
dangerous_iterator find_dangerous(const dimension_type c);
   dangerous_iterator lower_bound_dangerous(const dimension_type c);
-  dangerous_iterator upper_bound_dangerous(const dimension_type c);
   iterator find(const dimension_type c);
   iterator lower_bound(const dimension_type c);
-  iterator upper_bound(const dimension_type c);
   const_iterator find(const dimension_type c) const;
   const_iterator lower_bound(const dimension_type c) const;
-  const_iterator upper_bound(const dimension_type c) const;
//! Equivalent to find_create(i,x,begin_dangerous()) .
   iterator find_create(const dimension_type i,const Coefficient& x);
@@ -349,13 +346,10 @@ public:
dangerous_iterator find_dangerous(const dimension_type c);
   dangerous_iterator lower_bound_dangerous(const dimension_type c);
-  dangerous_iterator upper_bound_dangerous(const dimension_type c);
   iterator find(const dimension_type c);
   iterator lower_bound(const dimension_type c);
-  iterator upper_bound(const dimension_type c);
   const_iterator find(const dimension_type c) const;
   const_iterator lower_bound(const dimension_type c) const;
-  const_iterator upper_bound(const dimension_type c) const;
//! Equivalent to find_create(i,x,begin_dangerous()) .
   iterator find_create(const dimension_type i,const Coefficient& x);
diff --git a/src/Sparse_Row.inlines.hh b/src/Sparse_Row.inlines.hh
index 385cef0..bde9ddc 100644
--- a/src/Sparse_Row.inlines.hh
+++ b/src/Sparse_Row.inlines.hh
@@ -223,11 +223,6 @@ Sparse_Row::lower_bound(const dimension_type k) {
   return row.lower_bound(k);
 }
-inline Sparse_Row::iterator
-Sparse_Row::upper_bound(const dimension_type k) {
-  return row.upper_bound(k);
-}
-
 inline Sparse_Row::const_iterator
 Sparse_Row::find(const dimension_type k) const {
   return row.find(k);
@@ -238,11 +233,6 @@ Sparse_Row::lower_bound(const dimension_type k) const {
   return row.lower_bound(k);
 }
-inline Sparse_Row::const_iterator
-Sparse_Row::upper_bound(const dimension_type k) const {
-  return row.upper_bound(k);
-}
-
 inline Sparse_Row::iterator
 Sparse_Row::find_create(const dimension_type i,const Coefficient& x) {
   PPL_ASSERT(i < size_);
@@ -516,11 +506,6 @@ Sparse_Row_Reference::lower_bound_dangerous(const dimension_type c) {
   return row.lower_bound_dangerous(c);
 }
-inline Sparse_Row_Reference::dangerous_iterator
-Sparse_Row_Reference::upper_bound_dangerous(const dimension_type c) {
-  return row.upper_bound_dangerous(c);
-}
-
 inline Sparse_Row_Reference::iterator
 Sparse_Row_Reference::find(const dimension_type c) {
   return row.find(c);
@@ -531,11 +516,6 @@ Sparse_Row_Reference::lower_bound(const dimension_type c) {
   return row.lower_bound(c);
 }
-inline Sparse_Row_Reference::iterator
-Sparse_Row_Reference::upper_bound(const dimension_type c) {
-  return row.upper_bound(c);
-}
-
 inline Sparse_Row_Reference::const_iterator
 Sparse_Row_Reference::find(const dimension_type c) const {
   return row.find(c);
@@ -546,11 +526,6 @@ Sparse_Row_Reference::lower_bound(const dimension_type c) const {
   return row.lower_bound(c);
 }
-inline Sparse_Row_Reference::const_iterator
-Sparse_Row_Reference::upper_bound(const dimension_type c) const {
-  return row.upper_bound(c);
-}
-
 inline Sparse_Row_Reference::iterator
 Sparse_Row_Reference::find_create(const dimension_type i) {
   PPL_ASSERT(i < size_);
diff --git a/src/Unlimited_Sparse_Row.defs.hh b/src/Unlimited_Sparse_Row.defs.hh
index 5d0d43e..65e234d 100644
--- a/src/Unlimited_Sparse_Row.defs.hh
+++ b/src/Unlimited_Sparse_Row.defs.hh
@@ -343,13 +343,10 @@ public:
dangerous_iterator find_dangerous(const dimension_type c);
   dangerous_iterator lower_bound_dangerous(const dimension_type c);
-  dangerous_iterator upper_bound_dangerous(const dimension_type c);
   iterator find(const dimension_type c);
   iterator lower_bound(const dimension_type c);
-  iterator upper_bound(const dimension_type c);
   const_iterator find(const dimension_type c) const;
   const_iterator lower_bound(const dimension_type c) const;
-  const_iterator upper_bound(const dimension_type c) const;
//! Looks for an element with key c, assuming it is in [itr,end()) .
   dangerous_iterator find_dangerous(const dimension_type c,
@@ -357,23 +354,16 @@ public:
   //! Lower bound of key c, assuming it is in [itr,end()) .
   dangerous_iterator lower_bound_dangerous(const dimension_type c,
                                            dangerous_iterator itr);
-  //! Upper bound of key c, assuming it is in [itr,end()) .
-  dangerous_iterator upper_bound_dangerous(const dimension_type c,
-                                           dangerous_iterator itr);
//! Looks for an element with key c, assuming it is in [itr,end()) .
   iterator find(const dimension_type c,iterator itr);
   //! Lower bound of key c, assuming it is in [itr,end()) .
   iterator lower_bound(const dimension_type c,iterator itr);
-  //! Upper bound of key c, assuming it is in [itr,end()) .
-  iterator upper_bound(const dimension_type c,iterator itr);
//! Looks for an element with key c, assuming it is in [itr,end()) .
   const_iterator find(const dimension_type c,const_iterator itr) const;
   //! Lower bound of key c, assuming it is in [itr,end()) .
   const_iterator lower_bound(const dimension_type c,const_iterator itr) const;
-  //! Upper bound of key c, assuming it is in [itr,end()) .
-  const_iterator upper_bound(const dimension_type c,const_iterator itr) const;
//! A faster equivalent of
   //! itr1=find_dangerous(c1); itr2=find_dangerous(c2); .
diff --git a/src/Unlimited_Sparse_Row.inlines.hh b/src/Unlimited_Sparse_Row.inlines.hh
index f627960..a4645a0 100644
--- a/src/Unlimited_Sparse_Row.inlines.hh
+++ b/src/Unlimited_Sparse_Row.inlines.hh
@@ -316,17 +316,6 @@ Unlimited_Sparse_Row::lower_bound_dangerous(const dimension_type k) {
   return lower_bound_dangerous(k,i);
 }
-inline Unlimited_Sparse_Row::dangerous_iterator
-Unlimited_Sparse_Row::upper_bound_dangerous(const dimension_type k) {
-  if (begin() == end())
-    return end_dangerous();
-  dangerous_iterator i = begin_dangerous();
-  if ((*i).first > k)
-    return i;
-  // Now we can call upper_bound(k,i) without triggering asserts.
-  return upper_bound_dangerous(k,i);
-}
-
 inline Unlimited_Sparse_Row::iterator
 Unlimited_Sparse_Row::find(const dimension_type k) {
   if (begin() == end())
@@ -349,17 +338,6 @@ Unlimited_Sparse_Row::lower_bound(const dimension_type k) {
   return lower_bound(k,i);
 }
-inline Unlimited_Sparse_Row::iterator
-Unlimited_Sparse_Row::upper_bound(const dimension_type k) {
-  if (begin() == end())
-    return end();
-  iterator i = begin();
-  if ((*i).first > k)
-    return i;
-  // Now we can call upper_bound(k,i) without triggering asserts.
-  return upper_bound(k,i);
-}
-
 inline Unlimited_Sparse_Row::const_iterator
 Unlimited_Sparse_Row::find(const dimension_type k) const {
   if (begin() == end())
@@ -382,17 +360,6 @@ Unlimited_Sparse_Row::lower_bound(const dimension_type k) const {
   return lower_bound(k,i);
 }
-inline Unlimited_Sparse_Row::const_iterator
-Unlimited_Sparse_Row::upper_bound(const dimension_type k) const {
-  if (begin() == end())
-    return end();
-  const_iterator i = begin();
-  if ((*i).first > k)
-    return i;
-  // Now we can call upper_bound(k,i) without triggering asserts.
-  return upper_bound(k,i);
-}
-
 inline Unlimited_Sparse_Row::dangerous_iterator
 Unlimited_Sparse_Row
 ::find_dangerous(const dimension_type k,dangerous_iterator itr1) {
@@ -412,14 +379,6 @@ Unlimited_Sparse_Row
                           value_key_compare(std::less<dimension_type>()));
 }
-inline Unlimited_Sparse_Row::dangerous_iterator
-Unlimited_Sparse_Row
-::upper_bound_dangerous(const dimension_type k,dangerous_iterator itr) {
-  PPL_ASSERT(itr == end_dangerous() || (*itr).first <= k);
-  return std::upper_bound(itr,end_dangerous(),k,
-                          key_value_compare(std::less<dimension_type>()));
-}
-
 inline Unlimited_Sparse_Row::iterator
 Unlimited_Sparse_Row::find(const dimension_type k,iterator itr1) {
   PPL_ASSERT(itr1 == end() || (*itr1).first <= k);
@@ -437,14 +396,6 @@ Unlimited_Sparse_Row::lower_bound(const dimension_type k, iterator itr) {
                           value_key_compare(std::less<dimension_type>()));
 }
-inline Unlimited_Sparse_Row::iterator
-Unlimited_Sparse_Row
-::upper_bound(const dimension_type k,iterator itr) {
-  PPL_ASSERT(itr == end() || (*itr).first <= k);
-  return std::upper_bound(itr,end(),k,
-                          key_value_compare(std::less<dimension_type>()));
-}
-
 inline Unlimited_Sparse_Row::const_iterator
 Unlimited_Sparse_Row::find(const dimension_type k,const_iterator itr1) const {
   PPL_ASSERT(itr1 == end() || (*itr1).first <= k);
@@ -463,14 +414,6 @@ Unlimited_Sparse_Row
                           value_key_compare(std::less<dimension_type>()));
 }
-inline Unlimited_Sparse_Row::const_iterator
-Unlimited_Sparse_Row
-::upper_bound(const dimension_type k,const_iterator itr1) const {
-  PPL_ASSERT(itr1 == end() || (*itr1).first <= k);
-  return std::upper_bound(itr1,end(),k,
-                          key_value_compare(std::less<dimension_type>()));
-}
-
 inline void
 Unlimited_Sparse_Row
 ::find2_dangerous(const dimension_type c1,const dimension_type c2,

    

Marco Poletti

tags (0)

participants (1)