Skip to content

Commit

Permalink
chore: rename heap to queue, clean up doctest, bench -> `bench_…
Browse files Browse the repository at this point in the history
…local` where possible
  • Loading branch information
basdirks-purple committed Apr 2, 2024
1 parent 304cb58 commit fd8b97e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
4 changes: 2 additions & 2 deletions benches/min_distances_unweighted/graph_1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fn dijkstra(bencher: Bencher) {
vec![(3, 1), (4, 1), (6, 1)],
];

bencher.bench_local(|| {
bencher.bench(|| {
dijkstra::min_distances_single_source(&graph, 0);
});
}
Expand All @@ -41,7 +41,7 @@ fn bfs(bencher: Bencher) {
vec![3, 4, 6],
];

bencher.bench_local(|| {
bencher.bench(|| {
bfs::min_distances_single_source(&graph, 0);
});
}
16 changes: 5 additions & 11 deletions src/algo/bfs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,7 @@ pub fn min_distances<G, W>(
/// # Example
///
/// ```
/// extern crate alloc;
///
/// use {
/// alloc::collections::BinaryHeap,
/// core::cmp::Reverse,
/// graaf::algo::bfs::min_distances_single_source,
/// };
/// use graaf::algo::bfs::min_distances_single_source;
///
/// // ╭───╮ ╭───╮
/// // │ 0 │ → │ 1 │
Expand Down Expand Up @@ -190,8 +184,8 @@ mod test {
fn no_source() {
let graph: [Vec<usize>; 0] = [];
let mut dist = Vec::new();
let mut heap = VecDeque::new();
let () = min_distances(&graph, |w: usize| w + 1, &mut dist, &mut heap);
let mut queue = VecDeque::new();
let () = min_distances(&graph, |w: usize| w + 1, &mut dist, &mut queue);

assert!(dist.is_empty());
}
Expand All @@ -200,8 +194,8 @@ mod test {
fn single_source() {
let graph: [Vec<usize>; 4] = [vec![1], vec![2], Vec::new(), vec![0]];
let mut dist = [0, usize::MAX, usize::MAX, usize::MAX];
let mut heap = VecDeque::from([(0, 0)]);
let () = min_distances(&graph, |w| w + 1, &mut dist, &mut heap);
let mut queue = VecDeque::from([(0, 0)]);
let () = min_distances(&graph, |w| w + 1, &mut dist, &mut queue);

assert_eq!(dist, [0, 1, 2, usize::MAX]);
}
Expand Down

0 comments on commit fd8b97e

Please sign in to comment.