Skip to content

use functional style #377

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.

Sign up for GitHub

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
Nov 4, 2022
Merged

use functional style #377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 7 additions & 18 deletions src/node_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ impl NodeTable {
/// flag.remove(tskit::NodeFlags::IS_SAMPLE);
/// }
/// assert!(!tables.nodes_mut().flags_array_mut().iter().any(|f| f.is_sample()));
/// assert!(tables.nodes().samples_as_vector().is_empty());
/// ```
///
/// ```
Expand Down Expand Up @@ -404,28 +405,16 @@ impl NodeTable {
/// of all nodes for which [`crate::TSK_NODE_IS_SAMPLE`]
/// is `true`.
pub fn samples_as_vector(&self) -> Vec<NodeId> {
let mut samples: Vec<NodeId> = vec![];
for row in self.iter() {
if row.flags.contains(NodeFlags::IS_SAMPLE) {
samples.push(row.id);
}
}
samples
self.create_node_id_vector(|row| row.flags.contains(NodeFlags::IS_SAMPLE))
}

/// Obtain a vector containing the indexes ("ids") of all nodes
/// satisfying a certain criterion.
pub fn create_node_id_vector(
&self,
mut f: impl FnMut(&crate::NodeTableRow) -> bool,
) -> Vec<NodeId> {
let mut samples: Vec<NodeId> = vec![];
for row in self.iter() {
if f(&row) {
samples.push(row.id);
}
}
samples
pub fn create_node_id_vector(&self, mut f: impl FnMut(&NodeTableRow) -> bool) -> Vec<NodeId> {
self.iter()
.filter(|row| f(row))
.map(|row| row.id)
.collect::<Vec<_>>()
}
}

Expand Down