implement Ord for genome::Interval.

Author: johanneskoester

src/annot/mod.rs

@@ -52,7 +52,7 @@ pub mod pos;
 pub mod refids;
 pub mod spliced;
 
-/// Errors that arise in parsing annotations.
+// Errors that arise in parsing annotations.
 quick_error! {
     #[derive(Debug, Clone)]
     pub enum ParseAnnotError {
@@ -74,7 +74,7 @@ quick_error! {
     }
 }
 
-/// Errors that arise in maniuplating annotations
+// Errors that arise in maniuplating annotations
 quick_error! {
     #[derive(Debug, Clone)]
     pub enum AnnotError {

src/genome.rs

@@ -1,3 +1,4 @@
+use std::cmp;
 use std::ops::Range;
 
 pub type Position = u64;
@@ -16,6 +17,23 @@ pub struct Interval {
     range: Range<Position>,
 }
 
+impl PartialOrd for Interval {
+    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
+        Some(self.contig.cmp(&other.contig).then_with(|| {
+            self.range
+                .start
+                .cmp(&other.range.start)
+                .then_with(|| self.range.end.cmp(&other.range.end))
+        }))
+    }
+}
+
+impl Ord for Interval {
+    fn cmp(&self, other: &Self) -> cmp::Ordering {
+        self.partial_cmp(other).unwrap()
+    }
+}
+
 impl Interval {
     /// Mutable reference to interval on the contig
     pub fn range_mut(&mut self) -> &mut Range<Position> {
@@ -40,15 +58,15 @@ pub trait AbstractLocus {
     fn pos(&self) -> Position;
 }
 
-#[derive(new, Debug, PartialEq, Eq, Clone, Hash, Serialize, Deserialize)]
+#[derive(new, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Hash, Serialize, Deserialize)]
 pub struct Locus {
     contig: String,
     pos: Position,
 }
 
 impl Locus {
     /// Mutable reference to position.
-    fn pos_mut(&mut self) -> &mut Position {
+    pub fn pos_mut(&mut self) -> &mut Position {
         &mut self.pos
     }
 }