more

Author: molpopgen

src/edge_table.rs

@@ -233,15 +233,7 @@ impl EdgeTable {
     /// * `Some(child)` if `u` is valid.
     /// * `None` otherwise.
     pub fn child<E: Into<EdgeId> + Copy>(&self, row: E) -> Option<NodeId> {
-        assert!(self.num_rows() == 0 || !self.as_ref().child.is_null());
-        // SAFETY: either the column is empty or the point is not NULL
-        unsafe {
-            sys::tsk_column_access::<NodeId, _, _, _>(
-                row.into(),
-                self.as_ref().child,
-                self.num_rows(),
-            )
-        }
+        self.table_.child(row.into())
     }
 
     /// Return the ``left`` value from row ``row`` of the table.
@@ -251,15 +243,7 @@ impl EdgeTable {
     /// * `Some(position)` if `u` is valid.
     /// * `None` otherwise.
     pub fn left<E: Into<EdgeId> + Copy>(&self, row: E) -> Option<Position> {
-        assert!(self.num_rows() == 0 || !self.as_ref().left.is_null());
-        // SAFETY: either the column is empty or the point is not NULL
-        unsafe {
-            sys::tsk_column_access::<Position, _, _, _>(
-                row.into(),
-                self.as_ref().left,
-                self.num_rows(),
-            )
-        }
+        self.table_.left(row.into())
     }
 
     /// Return the ``right`` value from row ``row`` of the table.
@@ -269,15 +253,7 @@ impl EdgeTable {
     /// * `Some(position)` if `u` is valid.
     /// * `None` otherwise.
     pub fn right<E: Into<EdgeId> + Copy>(&self, row: E) -> Option<Position> {
-        assert!(self.num_rows() == 0 || !self.as_ref().right.is_null());
-        // SAFETY: either the column is empty or the point is not NULL
-        unsafe {
-            sys::tsk_column_access::<Position, _, _, _>(
-                row.into(),
-                self.as_ref().right,
-                self.num_rows(),
-            )
-        }
+        self.table_.left(row.into())
     }
 
     /// Retrieve decoded metadata for a `row`.

src/sys/edge_table.rs

@@ -2,6 +2,7 @@ use std::ptr::NonNull;
 
 use super::newtypes::EdgeId;
 use super::newtypes::NodeId;
+use super::newtypes::Position;
 
 use super::bindings::tsk_edge_table_add_row;
 use super::bindings::tsk_edge_table_clear;
@@ -72,6 +73,18 @@ impl EdgeTable {
     pub fn parent(&self, row: EdgeId) -> Option<NodeId> {
         safe_tsk_column_access!(self, row, NodeId, parent)
     }
+
+    pub fn child(&self, row: EdgeId) -> Option<NodeId> {
+        safe_tsk_column_access!(self, row, NodeId, child)
+    }
+
+    pub fn left(&self, row: EdgeId) -> Option<Position> {
+        safe_tsk_column_access!(self, row, Position, left)
+    }
+
+    pub fn right(&self, row: EdgeId) -> Option<Position> {
+        safe_tsk_column_access!(self, row, Position, right)
+    }
 }
 
 impl Default for EdgeTable {