more

Author: molpopgen

src/node_table.rs

@@ -480,12 +480,7 @@ impl NodeTable {
     /// # }
     /// ```
     pub fn time<N: Into<NodeId> + Copy>(&self, row: N) -> Option<Time> {
-        assert!(self.num_rows() == 0 || !self.as_ref().time.is_null());
-        // SAFETY: either the column is empty or the pointer is not null,
-        // in which case the correct lengths are from the low-level objects
-        unsafe {
-            sys::tsk_column_access::<Time, _, _, _>(row.into(), self.as_ref().time, self.num_rows())
-        }
+        self.table_.time(row.into())
     }
 
     /// Return the ``flags`` value from row ``row`` of the table.
@@ -510,16 +505,7 @@ impl NodeTable {
     /// # }
     /// ```
     pub fn flags<N: Into<NodeId> + Copy>(&self, row: N) -> Option<NodeFlags> {
-        assert!(self.num_rows() == 0 || !self.as_ref().flags.is_null());
-        // SAFETY: either the column is empty or the pointer is not null,
-        // in which case the correct lengths are from the low-level objects
-        unsafe {
-            sys::tsk_column_access::<NodeFlags, _, _, _>(
-                row.into(),
-                self.as_ref().flags,
-                self.num_rows(),
-            )
-        }
+        self.table_.flags(row.into())
     }
 
     /// Return the ``population`` value from row ``row`` of the table.
@@ -544,16 +530,7 @@ impl NodeTable {
     /// * `Some(population)` if `row` is valid.
     /// * `None` otherwise.
     pub fn population<N: Into<NodeId> + Copy>(&self, row: N) -> Option<PopulationId> {
-        assert!(self.num_rows() == 0 || !self.as_ref().population.is_null());
-        // SAFETY: either the column is empty or the pointer is not null,
-        // in which case the correct lengths are from the low-level objects
-        unsafe {
-            sys::tsk_column_access::<PopulationId, _, _, _>(
-                row.into(),
-                self.as_ref().population,
-                self.num_rows(),
-            )
-        }
+        self.table_.population(row.into())
     }
 
     /// Return the ``population`` value from row ``row`` of the table.
@@ -592,16 +569,7 @@ impl NodeTable {
     /// * `Some(individual)` if `row` is valid.
     /// * `None` otherwise.
     pub fn individual<N: Into<NodeId> + Copy>(&self, row: N) -> Option<IndividualId> {
-        assert!(self.num_rows() == 0 || !self.as_ref().individual.is_null());
-        // SAFETY: either the column is empty or the pointer is not null,
-        // in which case the correct lengths are from the low-level objects
-        unsafe {
-            sys::tsk_column_access::<IndividualId, _, _, _>(
-                row.into(),
-                self.as_ref().individual,
-                self.num_rows(),
-            )
-        }
+        self.table_.individual(row.into())
     }
 
     /// Retrieve decoded metadata for a `row`.

src/sys/node_table.rs

@@ -1,5 +1,10 @@
 use std::ptr::NonNull;
 
+use crate::IndividualId;
+use crate::NodeFlags;
+use crate::PopulationId;
+use crate::Time;
+
 use super::bindings::tsk_node_table_add_row;
 use super::bindings::tsk_node_table_clear;
 use super::bindings::tsk_node_table_init;
@@ -108,6 +113,22 @@ impl NodeTable {
             })
         }
     }
+
+    pub fn individual(&self, row: NodeId)  -> Option<IndividualId> {
+        safe_tsk_column_access!(self, row, IndividualId, individual )
+    }
+
+    pub fn population(&self, row: NodeId)  -> Option<PopulationId> {
+        safe_tsk_column_access!(self, row, PopulationId, population )
+    }
+
+    pub fn time(&self, row: NodeId)  -> Option<Time> {
+        safe_tsk_column_access!(self, row, Time, time )
+    }
+
+    pub fn flags(&self, row: NodeId)  -> Option<NodeFlags> {
+        safe_tsk_column_access!(self, row, NodeFlags, flags )
+    }
 }
 
 impl Default for NodeTable {