bring it back

Author: molpopgen

src/lib.rs

@@ -117,6 +117,7 @@ pub use site_table::{SiteTable, SiteTableRow};
 pub use sys::flags::*;
 pub use sys::NodeTraversalOrder;
 pub use table_collection::TableCollection;
+pub use table_column::TableColumn;
 pub use traits::IndividualLocation;
 pub use traits::IndividualParents;
 pub use trees::{Tree, TreeSequence};

src/node_table.rs

@@ -807,21 +807,21 @@ impl NodeTable {
         /// Get the population column as a slice
         => population, population_slice_raw, crate::sys::bindings::tsk_id_t);
 
-    //pub fn individual_column(&self) -> crate::table_column::NodeTableColumn<IndividualId> {
-    //    crate::NodeTableColumn::new(self.individual_slice())
-    //}
+    pub fn individual_column(&self) -> impl crate::TableColumn<NodeId, IndividualId> + '_ {
+        crate::table_column::OpaqueTableColumn(self.individual_slice())
+    }
 
-    //pub fn population_column(&self) -> crate::NodeTableColumn<PopulationId> {
-    //    crate::NodeTableColumn::new(self.population_slice())
-    //}
+    pub fn population_column(&self) -> impl crate::TableColumn<NodeId, PopulationId> + '_ {
+        crate::table_column::OpaqueTableColumn(self.population_slice())
+    }
 
-    //pub fn time_column(&self) -> crate::NodeTableColumn<Time> {
-    //    crate::NodeTableColumn::new(self.time_slice())
-    //}
+    pub fn time_column(&self) -> impl crate::TableColumn<NodeId, Time> + '_ {
+        crate::table_column::OpaqueTableColumn(self.time_slice())
+    }
 
-    //pub fn flags_column(&self) -> crate::NodeTableColumn<NodeFlags> {
-    //    crate::NodeTableColumn::new(self.flags_slice())
-    //}
+    pub fn flags_column(&self) -> impl crate::TableColumn<NodeId, NodeFlags> + '_ {
+        crate::table_column::OpaqueTableColumn(self.flags_slice())
+    }
 
     /// Clear all data from the table
     pub fn clear(&mut self) -> Result<i32, TskitError> {

src/table_column.rs

@@ -13,6 +13,7 @@ impl<T> std::ops::Index<usize> for OpaqueTableColumn<'_, T> {
 trait NewTypeMarker: TryInto<usize, Error = crate::TskitError> {}
 
 impl NewTypeMarker for crate::EdgeId {}
+impl NewTypeMarker for crate::NodeId {}
 
 impl<T> std::ops::Index<crate::SizeType> for OpaqueTableColumn<'_, T> {
     type Output = T;