Skip to content

feat: add tskit::OwnedSiteTable #283

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
Jul 20, 2022
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
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ pub use migration_table::{MigrationTable, MigrationTableRow};
pub use mutation_table::{MutationTable, MutationTableRow, OwnedMutationTable};
pub use node_table::{NodeTable, NodeTableRow, OwnedNodeTable};
pub use population_table::{OwnedPopulationTable, PopulationTable, PopulationTableRow};
pub use site_table::{SiteTable, SiteTableRow};
pub use site_table::{OwnedSiteTable, SiteTable, SiteTableRow};
pub use table_collection::TableCollection;
pub use traits::IndividualLocation;
pub use traits::IndividualParents;
Expand Down
57 changes: 57 additions & 0 deletions src/site_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use crate::Position;
use crate::SiteId;
use crate::SizeType;
use crate::TskitError;
use ll_bindings::{tsk_site_table_free, tsk_site_table_init};

/// Row of a [`SiteTable`]
pub struct SiteTableRow {
Expand Down Expand Up @@ -152,3 +153,59 @@ impl<'a> SiteTable<'a> {
table_row_access!(r.into().0, self, make_site_table_row)
}
}

build_owned_table_type!(
/// A standalone site table that owns its data.
///
/// # Examples
///
/// ```
/// use tskit::OwnedSiteTable;
///
/// let mut sites = OwnedSiteTable::default();
/// let rowid = sites.add_row(1., None).unwrap();
/// assert_eq!(rowid, 0);
/// assert_eq!(sites.num_rows(), 1);
/// ```
///
/// An example with metadata.
/// This requires the cargo feature `"derive"` for `tskit`.
///
/// ```
/// # #[cfg(any(feature="doc", feature="derive"))] {
/// use tskit::OwnedSiteTable;
///
/// #[derive(serde::Serialize,
/// serde::Deserialize,
/// tskit::metadata::SiteMetadata)]
/// #[serializer("serde_json")]
/// struct SiteMetadata {
/// value: i32,
/// }
///
/// let metadata = SiteMetadata{value: 42};
///
/// let mut sites = OwnedSiteTable::default();
///
/// let rowid = sites.add_row_with_metadata(0., None, &metadata).unwrap();
/// assert_eq!(rowid, 0);
///
/// if let Some(decoded) = sites.metadata::<SiteMetadata>(rowid).unwrap() {
/// assert_eq!(decoded.value, 42);
/// } else {
/// panic!("hmm...we expected some metadata!");
/// }
///
/// # }
/// ```
=> OwnedSiteTable,
SiteTable,
tsk_site_table_t,
tsk_site_table_init,
tsk_site_table_free
);

impl OwnedSiteTable {
site_table_add_row!(=> add_row, self, *self.table);
site_table_add_row_with_metadata!(=> add_row_with_metadata, self, *self.table);
}