Changeset 3384

Timestamp:

Mar 11, 2015, 4:02:19 AM (8 years ago)

Author:

Peter

Message:

closes #826

Location:

trunk

Files:

• test/bam.cc (modified) (2 diffs)
• yat/omic/BamRead.cc (modified) (3 diffs)
• yat/omic/BamRead.h (modified) (3 diffs)

trunk/test/bam.cc

@@ -1 +1 @@
 // $Id$
 //
-// Copyright (C) 2013, 2014 Peter Johansson
+// Copyright (C) 2013, 2014, 2015 Peter Johansson
 //
 // This program is free software; you can redistribute it and/or modify
@@ -105 +105 @@
   if (!suite.add(same_query_name(b, bam)))
     suite.err() << "error: \n'" << b.name() << "'\n'" << bam.name() << "'\n";
+  if (!suite.add(!less_query_name(b, bam)))
+    suite.err() << "error: less_query_name:\n'"
+                << b.name() << "'\n'" << bam.name() << "'\n";
+
+  BamLessName less_name;
+  if (!suite.add(!less_name(b, bam)))
+    suite.err() << "error: BamLessName:\n'"
+                << b.name() << "'\n'" << bam.name() << "'\n";
 
   if (!suite.add(b.sequence()==bam.sequence()))

trunk/yat/omic/BamRead.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2012, 2013, 2014 Peter Johansson
+  Copyright (C) 2012, 2013, 2014, 2015 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -441 +441 @@
 
 
+  bool less_query_name(const BamRead& lhs, const BamRead& rhs)
+  {
+    return std::lexicographical_compare(lhs.name(),
+                                        lhs.name()+lhs.core().l_qname,
+                                        rhs.name(),
+                                        rhs.name()+rhs.core().l_qname);
+  }
+
+
   void swap(BamRead& lhs, BamRead& rhs)
   {
     lhs.swap(rhs);
   }
+
 
   bool same_query_name(const BamRead& lhs, const BamRead& rhs)
@@ -501 +511 @@
   }
 
+
+  bool BamLessName::operator()(const BamRead& lhs, const BamRead& rhs) const
+  {
+    return less_query_name(lhs, rhs);
+  }
+
 }}}

trunk/yat/omic/BamRead.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2012, 2013, 2014 Peter Johansson
+  Copyright (C) 2012, 2013, 2014, 2015 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -371 +371 @@
 
   /**
+     return \c true if lhs query name is less than rhs query name
+
+     \see BamRead::name()
+
+     \since New in yat 0.13
+
+     \relates BamRead
+   */
+  bool less_query_name(const BamRead& lhs, const BamRead& rhs);
+
+  /**
      Functor to compare two reads with respect to their leftmost
      coordinate.
@@ -411 +422 @@
   };
 
+  /**
+     Functor to compare two reads with respect to their query names.
+
+     \see BamRead
+     \see less_query_name(const BamRead&, const BamRead&)
+
+     \since New in yat 0.13
+   */
+  struct BamLessName
+    : public std::binary_function<const BamRead&, const BamRead&, bool>
+  {
+    /**
+       \return \c true if lhs query name is less than rhs query name
+     */
+    bool operator()(const BamRead& lhs, const BamRead& rhs) const;
+  };
+
 }}}
 #endif