Changeset 3176 for trunk/yat/omic/BamPairIterator.h

Timestamp:

Mar 15, 2014, 10:10:37 AM (9 years ago)

Author:

Peter

Message:

closes #784. New class BamPairProxy? to finalize implementation of BamPairIterator?.

File:

• trunk/yat/omic/BamPairIterator.h (modified) (6 diffs)

trunk/yat/omic/BamPairIterator.h

@@ -60 +60 @@
   class BamPairIterator
     : public boost::iterator_facade<
-    BamPairIterator<Base>, const BamPair, std::input_iterator_tag
+    BamPairIterator<Base>, const BamPair, std::input_iterator_tag,
+    const BamPairProxy
     >
   {
@@ -81 +82 @@
     Base iter_;
     Base end_;
-    BamPair x_;
+    const BamRead* mate_;
     boost::shared_ptr<std::map<std::string, BamRead> > siam_reads_;
     typedef std::pair<int32_t, int32_t> Position;
@@ -87 +88 @@
     friend class boost::iterator_core_access;
 
-    const BamPair& dereference(void) const;
+    const BamPairProxy dereference(void) const;
     bool equal(const BamPairIterator& other) const;
     void increment(void);
@@ -143 +144 @@
 
   template<typename Base>
-  const BamPair&
+  const BamPairProxy
   BamPairIterator<Base>::dereference(void) const
   {
-    return x_;
+    return BamPairProxy(mate_, &*iter_);
   }
 
@@ -189 +190 @@
         for (; lower!=reads_->end() && lower->first == position; ++lower)
           if (same_query_name(lower->second, *iter_)) {
-            x_.first() = lower->second;
-            x_.second() = *iter_;
+            mate_ = &lower->second;
             return;
           }
@@ -199 +199 @@
           mate = siam_reads_->lower_bound(iter_->name());
         if (mate!=siam_reads_->end() && same_query_name(mate->second, *iter_)) {
-          x_.first() = mate->second;
-          x_.second() = *iter_;
+          mate_ = &mate->second;
           return;
         }