progress

Author: molpopgen

tests/test_edge_difference_iteration.rs

@@ -56,18 +56,45 @@ fn make_treeseq() -> tskit::TreeSequence {
         .unwrap()
 }
 
+// A fundamental property of iterators is that their Items
+// are collectible into objects that are valid to use later.
+
 #[test]
 fn test_collected_edge_insertions() {
     let ts = make_treeseq();
+    // The ergonomics here seem a bit ugly but it is a corner case?
     let insertions = ts
         .edge_differences_iter()
         .flat_map(|d| d.insertions().collect::<Vec<_>>())
         .collect::<Vec<_>>();
     assert_eq!(insertions.len(), ts.edge_insertion_order().len());
+    for (i, j) in insertions.iter().zip(ts.edge_insertion_order().iter()) {
+        assert_eq!(
+            i.parent(),
+            ts.tables().edges().parent_column()[j.as_usize()]
+        );
+        assert_eq!(i.child(), ts.tables().edges().child_column()[j.as_usize()]);
+        assert_eq!(i.left(), ts.tables().edges().left_column()[j.as_usize()]);
+        assert_eq!(i.right(), ts.tables().edges().right_column()[j.as_usize()]);
+    }
+
+    // Better ergonomics
+    let mut insertions = vec![];
+    for diffs in ts.edge_differences_iter() {
+        insertions.extend(diffs.insertions());
+    }
+    assert_eq!(insertions.len(), ts.edge_insertion_order().len());
+    for (i, j) in insertions.iter().zip(ts.edge_insertion_order().iter()) {
+        assert_eq!(
+            i.parent(),
+            ts.tables().edges().parent_column()[j.as_usize()]
+        );
+        assert_eq!(i.child(), ts.tables().edges().child_column()[j.as_usize()]);
+        assert_eq!(i.left(), ts.tables().edges().left_column()[j.as_usize()]);
+        assert_eq!(i.right(), ts.tables().edges().right_column()[j.as_usize()]);
+    }
 }
 
-// A fundamental property of iterators is that their Items
-// are collectible into objects that are valid to use later.
 #[test]
 fn test_collect_edge_diff_iterators() {
     let ts = make_treeseq();