Changeset 3300

Timestamp:

11/06/09 17:39:17 (2 weeks ago)

Author:

kraftche

Message:

add operator-(iter,iter) that counts distance between MBRange iterators

Location:

MOAB/trunk

Files:

• MBRange.cpp (modified) (2 diffs)
• MBRange.hpp (modified) (2 diffs)

MOAB/trunk/MBRange.cpp

@@ -234 +234 @@
 MBRange::iterator MBRange::insert( MBRange::iterator hint, MBEntityHandle val )
 {
-
-  // if this is empty, just add it and return an iterator to it
+  // don't allow zero-valued handles in MBRange
   if(val == 0)
     return end();
 
+  // if this is empty, just add it and return an iterator to it
   if(&mHead == mHead.mNext)
   {
@@ -734 +734 @@
 }
 
+  
+MBEntityID 
+operator-( const MBRange::const_iterator& it2, const MBRange::const_iterator& it1 )
+{
+  assert( !it2.mValue || *it2 >= *it1 );
+  if (it2.mNode == it1.mNode) {
+    return *it2 - *it1;
+  }
+
+  MBEntityID result = it1.mNode->second - it1.mValue + 1;
+  for (MBRange::PairNode* n = it1.mNode->mNext; n != it2.mNode; n = n->mNext)
+    result += n->second - n->first + 1;
+  if (it2.mValue) // (it2.mNode != &mHead)
+    result += it2.mValue - it2.mNode->first;
+  return result;
+}
+
+
 MBRange::const_iterator MBRange::lower_bound(MBRange::const_iterator first,
                                              MBRange::const_iterator last,

MOAB/trunk/MBRange.hpp

@@ -421 +421 @@
     friend class pair_iterator;
     friend class const_pair_iterator;
+    friend MBEntityID operator-( const const_iterator&, const const_iterator& );
   public:
     //! default constructor - intialize base default constructor
@@ -686 +687 @@
 operator-( MBEntityID step, const MBRange::const_iterator& it )
   { MBRange::const_iterator tmp(it); return tmp -= step; }
+  
+MBEntityID 
+operator-(  const MBRange::const_iterator& it1, const MBRange::const_iterator& it2 );
 
 //! Use as you would an STL back_inserter