Skip to content
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

Complete Permutations::size_hint #739

Merged
merged 9 commits into from
Sep 6, 2023
Merged

Complete Permutations::size_hint #739

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
087be29
Replace `CompleteStateRemaining` by `Option<usize>`
Philippe-Cholet Aug 27, 2023
ff77423
permutations: simplify `enough_vals`
Philippe-Cholet Aug 27, 2023
11d8b6b
size hint: `PermutationState::StartUnknownLen`
Philippe-Cholet Aug 27, 2023
7786d2e
size hint: `PermutationState::OngoingUnknownLen`
Philippe-Cholet Aug 27, 2023
92d3be2
Test permutations' `size_hint/count`
Philippe-Cholet Aug 27, 2023
95536d6
Comment `Permutations::size_hint`
Philippe-Cholet Aug 31, 2023
c12692e
Use `size_hint::sub_scalar` in `Permutations::size_hint`
Philippe-Cholet Sep 5, 2023
06abc3e
Test overflowed `Permutations::size_hint`
Philippe-Cholet Sep 5, 2023
65d0c60
Share code in `Permutations::size_hint`
Philippe-Cholet Sep 5, 2023
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
15 changes: 14 additions & 1 deletion src/permutations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,20 @@ where
upp = upp.and_then(|n| CompleteState::Start { n, k }.remaining());
(low, upp)
}
PermutationState::OngoingUnknownLen { .. } => (0, None), // TODO can we improve this lower bound?
PermutationState::OngoingUnknownLen { k, min_n } => {
let prev_iteration_count = min_n - k + 1;
let (mut low, mut upp) = self.vals.size_hint();
low = CompleteState::Start { n: low, k }
.remaining()
.unwrap_or(usize::MAX)
.saturating_sub(prev_iteration_count);
upp = upp.and_then(|n| {
CompleteState::Start { n, k }
.remaining()
.map(|count| count.saturating_sub(prev_iteration_count))
jswrenn marked this conversation as resolved.
Show resolved Hide resolved
});
(low, upp)
}
PermutationState::Complete(ref state) => match state.remaining() {
Some(count) => (count, Some(count)),
None => (::std::usize::MAX, None)
Expand Down