Skip to content

feat: get fns for table column types #729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/table_column.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ macro_rules! make_table_column {
pub fn as_slice(&self) -> &[T] {
self.0
}

pub fn get_with_id(&self, index: crate::$index) -> Option<&T> {
self.get_with_usize(usize::try_from(index).ok()?)
}

pub fn get_with_size_type(&self, index: crate::SizeType) -> Option<&T> {
self.get_with_usize(usize::try_from(index).ok()?)
}

pub fn get_with_usize(&self, index: usize) -> Option<&T> {
self.0.get(index)
}
}

impl<T> std::ops::Index<usize> for $name<'_, T> {
Expand Down
38 changes: 30 additions & 8 deletions tests/test_tables.rs
Original file line number Diff line number Diff line change
Expand Up @@ -557,12 +557,34 @@ fn test_node_table_column_access() {
let node = t
.add_row(tskit::NodeFlags::new_sample(), 0.0, -1, -1)
.unwrap();
let individual = t.individual_column();
assert_eq!(individual[node], tskit::IndividualId::NULL);
let population = t.population_column();
assert_eq!(population[node], tskit::PopulationId::NULL);
let time = t.time_column();
assert_eq!(time[node], 0.0);
let flags = t.flags_column();
assert_eq!(flags[node], tskit::NodeFlags::IS_SAMPLE);
{
let individual = t.individual_column();
assert_eq!(individual[node], tskit::IndividualId::NULL);
assert_eq!(
individual.get_with_id(node).unwrap(),
&tskit::IndividualId::NULL
);
assert!(individual.get_with_size_type(t.num_rows()).is_none());
}
{
let population = t.population_column();
assert_eq!(population[node], tskit::PopulationId::NULL);
assert_eq!(
population.get_with_id(node).unwrap(),
&tskit::PopulationId::NULL
);
}
{
let time = t.time_column();
assert_eq!(time[node], 0.0);
assert_eq!(time.get_with_id(node).unwrap(), &0.0);
}
{
let flags = t.flags_column();
assert_eq!(flags[node], tskit::NodeFlags::IS_SAMPLE);
assert_eq!(
flags.get_with_id(node).unwrap(),
&tskit::NodeFlags::IS_SAMPLE
);
}
}
Loading