more

Author: molpopgen

src/site_table.rs

@@ -202,14 +202,7 @@ impl SiteTable {
     /// * `Some(position)` if `row` is valid.
     /// * `None` otherwise.
     pub fn position<S: Into<SiteId> + Copy>(&self, row: S) -> Option<Position> {
-        assert!(self.num_rows() == 0 || !self.as_ref().position.is_null());
-        unsafe {
-            sys::tsk_column_access::<Position, _, _, _>(
-                row.into(),
-                self.as_ref().position,
-                self.num_rows(),
-            )
-        }
+        self.table_.position(row.into())
     }
 
     /// Get the ``ancestral_state`` value from row ``row`` of the table.

src/sys/site_table.rs

@@ -1,5 +1,8 @@
 use std::ptr::NonNull;
 
+use super::newtypes::Position;
+use super::newtypes::SiteId;
+
 use super::bindings::tsk_id_t;
 use super::bindings::tsk_site_table_add_row;
 use super::bindings::tsk_site_table_clear;
@@ -66,6 +69,10 @@ impl SiteTable {
             ))
         }
     }
+
+    pub fn position(&self, row: SiteId) -> Option<Position> {
+        safe_tsk_column_access!(self, row, Position, position)
+    }
 }
 
 impl Default for SiteTable {