stonewareslord/rust-selection-sort.kak
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup and add comments

Browse Source
This commit is contained in:
Austen Adler 2022-02-21 18:27:46 -05:00
parent 77bb2c859b
commit 3b7646c04e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sort.rs
View File

@ -35,6 +35,7 @@ struct SortableSelection<'a> {
subselections: Vec<&'a str>, subselections: Vec<&'a str>,
} }
/// Gets a Vec of sortable selections with a given list of subselections and descriptions
fn get_sortable_selections_subselections<'a, 'b, 'tmp, S: AsRef<str> + std::fmt::Debug + 'a>( fn get_sortable_selections_subselections<'a, 'b, 'tmp, S: AsRef<str> + std::fmt::Debug + 'a>(
sort_options: &'b SortOptions, sort_options: &'b SortOptions,
selections: &'a [S], selections: &'a [S],
@ -65,6 +66,8 @@ fn get_sortable_selections_subselections<'a, 'b, 'tmp, S: AsRef<str> + std::fmt:
subselections.sort_by(|(_, ssd_a), (_, ssd_b)| ssd_a.cmp(ssd_b)); subselections.sort_by(|(_, ssd_a), (_, ssd_b)| ssd_a.cmp(ssd_b));
// For each selection, check if they contain any subselections
// If so, add them to the subselections vector
// TODO: This is O(n^2), but can be made more efficient since subselections is sorted // TODO: This is O(n^2), but can be made more efficient since subselections is sorted
for (s, s_desc) in &mut sortable_selections { for (s, s_desc) in &mut sortable_selections {
for i in &subselections { for i in &subselections {
@ -75,19 +78,22 @@ fn get_sortable_selections_subselections<'a, 'b, 'tmp, S: AsRef<str> + std::fmt:
} }
sortable_selections.sort_by(|(a, _), (b, _)| { sortable_selections.sort_by(|(a, _), (b, _)| {
// First, check if there are any subselection comparisons to be made
// If one has more subselections than the other, stop comparing
for (a_subsel, b_subsel) in a.subselections.iter().zip(b.subselections.iter()) { for (a_subsel, b_subsel) in a.subselections.iter().zip(b.subselections.iter()) {
match a_subsel.cmp(b_subsel) { match a_subsel.cmp(b_subsel) {
// These subselecitons are equal, so we can't do anything
Ordering::Equal => continue, Ordering::Equal => continue,
// We found a difference, so return the comparison
o => return o, o => return o,
} }
} }
// No subselections mismatched, so compare the (possibly trimmed) content
a.content_comparison.cmp(b.content_comparison) a.content_comparison.cmp(b.content_comparison)
}); });
Ok(sortable_selections.into_iter().map(|(s, _)| s).collect()) Ok(sortable_selections.into_iter().map(|(s, _)| s).collect())
// todo!();
} }
fn to_sortable_selection<'a, 'b>( fn to_sortable_selection<'a, 'b>(