[Merged by Bors] - Add ExactSizeIterator implementation for QueryCombinatonIter#5148
Closed
nicopap wants to merge 1 commit intobevyengine:mainfrom
Closed
[Merged by Bors] - Add ExactSizeIterator implementation for QueryCombinatonIter#5148nicopap wants to merge 1 commit intobevyengine:mainfrom
nicopap wants to merge 1 commit intobevyengine:mainfrom
Conversation
nicopap
force-pushed
the
exact-size-query-combination
branch
from
4674c1c to
9e73a7e
Compare
nicopap
commented
Jun 30, 2022
| // binomial coefficient: (n ; k) = n! / k!(n-k)! = (n*n-1*...*n-k+1) / k! | ||
| // See https://en.wikipedia.org/wiki/Binomial_coefficient | ||
| // See https://blog.plover.com/math/choose.html for implementation | ||
| // It was chosen to reduce overflow potential. |
Contributor
Author
There was a problem hiding this comment.
Note: It reduces overflow potential at least compared to the previous solution which computed n! and k!(n-k)!. This still can overflow even when the result is not an overflow. An example is provided in https://blog.plover.com/math/choose-2.html
It's also probably slower than the previous solution, because it does k div and k checked_mul, while the previous one did 1 div, k mul and k checked_mul.
nicopap
commented
Jun 30, 2022
| assert_eq!(a_query.iter_combinations::<5>(w).count(), 0); | ||
| assert_eq!(a_query.iter_combinations::<5>(w).size_hint().1, Some(0)); | ||
| assert_eq!(a_query.iter_combinations::<128>(w).count(), 0); | ||
| assert_eq!(a_query.iter_combinations::<128>(w).size_hint().1, Some(0)); |
Contributor
Author
There was a problem hiding this comment.
I moved those tests to query_filtered_exactsizeiterator_len, so that they can be deduplicated and tested on more stuff.
alice-i-cecile
added
A-ECS
Member
|
Check the timings for your tests; they may be making miri take excessively long. bors retry |
nicopap
force-pushed
the
exact-size-query-combination
branch
from
9e73a7e to
8460fc4
Compare
Member
|
Despite this behavior being incorrect per #5149, I'd prefer to leave this behavior intact for consistency. That issue should be fixed all at once. |
nicopap
added a commit
to nicopap/bevy
that referenced
this pull request
Jul 5, 2022
Instead of returning the total count of elements in the `QueryIter` in `size_hint`, we return the count of remaining elements in it. This Fixes bevyengine#5149 (although, if bevyengine#5148 is merged, bevyengine#5149 will re-open) - bevyengine#5149 - bevyengine#5148
Member
|
@bevyengine/ecs-team can I get a review please? I'd like to merge this, then fix it all together in #5214. |
nicopap
added a commit
to nicopap/bevy
that referenced
this pull request
Jul 5, 2022
Instead of returning the total count of elements in the `QueryIter` in `size_hint`, we return the count of remaining elements in it. This Fixes bevyengine#5149 (although, if bevyengine#5148 is merged, bevyengine#5149 will re-open) - bevyengine#5149 - bevyengine#5148
nicopap
added a commit
to nicopap/bevy
that referenced
this pull request
Jul 5, 2022
Instead of returning the total count of elements in the `QueryIter` in `size_hint`, we return the count of remaining elements in it. This Fixes bevyengine#5149. This is also true of `QueryCombinationIter`. - bevyengine#5149 - bevyengine#5148
nicopap
added a commit
to nicopap/bevy
that referenced
this pull request
Jul 5, 2022
Instead of returning the total count of elements in the `QueryIter` in `size_hint`, we return the count of remaining elements in it. This Fixes bevyengine#5149. This is also true of `QueryCombinationIter`. - bevyengine#5149 - bevyengine#5148
alice-i-cecile
added
the
S-Ready-For-Final-Review
Member
|
IMO #5214 is basically guaranteed to land; the performance overhead doesn't look nearly as bad as I expected. Merging now for consistency. bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Jul 13, 2022
Following #5124 I decided to add the `ExactSizeIterator` impl for `QueryCombinationIter`. Also: - Clean up the tests for `size_hint` and `len` for both the normal `QueryIter` and `QueryCombinationIter`. - Add tests to `QueryCombinationIter` when it shouldn't be `ExactSizeIterator` --- ## Changelog - Added `ExactSizeIterator` implementation for `QueryCombinatonIter`
Contributor
|
Build failed (retrying...): |
bors bot
pushed a commit
that referenced
this pull request
Jul 13, 2022
Following #5124 I decided to add the `ExactSizeIterator` impl for `QueryCombinationIter`. Also: - Clean up the tests for `size_hint` and `len` for both the normal `QueryIter` and `QueryCombinationIter`. - Add tests to `QueryCombinationIter` when it shouldn't be `ExactSizeIterator` --- ## Changelog - Added `ExactSizeIterator` implementation for `QueryCombinatonIter`
Contributor
|
Build failed (retrying...): |
bors bot
pushed a commit
that referenced
this pull request
Jul 13, 2022
Following #5124 I decided to add the `ExactSizeIterator` impl for `QueryCombinationIter`. Also: - Clean up the tests for `size_hint` and `len` for both the normal `QueryIter` and `QueryCombinationIter`. - Add tests to `QueryCombinationIter` when it shouldn't be `ExactSizeIterator` --- ## Changelog - Added `ExactSizeIterator` implementation for `QueryCombinatonIter`
Contributor
|
Build failed: |
nicopap
force-pushed
the
exact-size-query-combination
branch
from
8460fc4 to
2927014
Compare
Member
|
bors retry |
bors bot
pushed a commit
that referenced
this pull request
Jul 13, 2022
Following #5124 I decided to add the `ExactSizeIterator` impl for `QueryCombinationIter`. Also: - Clean up the tests for `size_hint` and `len` for both the normal `QueryIter` and `QueryCombinationIter`. - Add tests to `QueryCombinationIter` when it shouldn't be `ExactSizeIterator` --- ## Changelog - Added `ExactSizeIterator` implementation for `QueryCombinatonIter`
nicopap
force-pushed
the
exact-size-query-combination
branch
from
2927014 to
865c34e
Compare
Contributor
|
Canceled. |
Member
|
bors retry |
bors bot
pushed a commit
that referenced
this pull request
Jul 13, 2022
Following #5124 I decided to add the `ExactSizeIterator` impl for `QueryCombinationIter`. Also: - Clean up the tests for `size_hint` and `len` for both the normal `QueryIter` and `QueryCombinationIter`. - Add tests to `QueryCombinationIter` when it shouldn't be `ExactSizeIterator` --- ## Changelog - Added `ExactSizeIterator` implementation for `QueryCombinatonIter`
Contributor
bors
bot
changed the title
nicopap
added a commit
to nicopap/bevy
that referenced
this pull request
Jul 13, 2022
Instead of returning the total count of elements in the `QueryIter` in `size_hint`, we return the count of remaining elements in it. This Fixes bevyengine#5149. This is also true of `QueryCombinationIter`. - bevyengine#5149 - bevyengine#5148
nicopap
added a commit
to nicopap/bevy
that referenced
this pull request
Jul 19, 2022
Instead of returning the total count of elements in the `QueryIter` in `size_hint`, we return the count of remaining elements in it. This Fixes bevyengine#5149. This is also true of `QueryCombinationIter`. - bevyengine#5149 - bevyengine#5148
nicopap
added a commit
to nicopap/bevy
that referenced
this pull request
Jul 22, 2022
Instead of returning the total count of elements in the `QueryIter` in `size_hint`, we return the count of remaining elements in it. This Fixes bevyengine#5149. This is also true of `QueryCombinationIter`. - bevyengine#5149 - bevyengine#5148
inodentry
pushed a commit
to IyesGames/bevy
that referenced
this pull request
Aug 8, 2022
…ine#5148) Following bevyengine#5124 I decided to add the `ExactSizeIterator` impl for `QueryCombinationIter`. Also: - Clean up the tests for `size_hint` and `len` for both the normal `QueryIter` and `QueryCombinationIter`. - Add tests to `QueryCombinationIter` when it shouldn't be `ExactSizeIterator` --- ## Changelog - Added `ExactSizeIterator` implementation for `QueryCombinatonIter`
nicopap
added a commit
to nicopap/bevy
that referenced
this pull request
Sep 1, 2022
Instead of returning the total count of elements in the `QueryIter` in `size_hint`, we return the count of remaining elements in it. This Fixes bevyengine#5149. This is also true of `QueryCombinationIter`. - bevyengine#5149 - bevyengine#5148
james7132
pushed a commit
to james7132/bevy
that referenced
this pull request
Oct 28, 2022
…ine#5148) Following bevyengine#5124 I decided to add the `ExactSizeIterator` impl for `QueryCombinationIter`. Also: - Clean up the tests for `size_hint` and `len` for both the normal `QueryIter` and `QueryCombinationIter`. - Add tests to `QueryCombinationIter` when it shouldn't be `ExactSizeIterator` --- ## Changelog - Added `ExactSizeIterator` implementation for `QueryCombinatonIter`
nicopap
added a commit
to nicopap/bevy
that referenced
this pull request
Nov 1, 2022
Instead of returning the total count of elements in the `QueryIter` in `size_hint`, we return the count of remaining elements in it. This Fixes bevyengine#5149. This is also true of `QueryCombinationIter`. - bevyengine#5149 - bevyengine#5148
bors bot
pushed a commit
that referenced
this pull request
Nov 21, 2022
…er (#5214) # Objective Fix #5149 ## Solution Instead of returning the **total count** of elements in the `QueryIter` in `size_hint`, we return the **count of remaining elements**. This Fixes #5149 even when #5148 gets merged. - #5149 - #5148 --- ## Changelog - Fix partially consumed `QueryIter` and `QueryCombinationIter` having invalid `size_hint` Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
cart
pushed a commit
that referenced
this pull request
Nov 30, 2022
…er (#5214) # Objective Fix #5149 ## Solution Instead of returning the **total count** of elements in the `QueryIter` in `size_hint`, we return the **count of remaining elements**. This Fixes #5149 even when #5148 gets merged. - #5149 - #5148 --- ## Changelog - Fix partially consumed `QueryIter` and `QueryCombinationIter` having invalid `size_hint` Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
…ine#5148) Following bevyengine#5124 I decided to add the `ExactSizeIterator` impl for `QueryCombinationIter`. Also: - Clean up the tests for `size_hint` and `len` for both the normal `QueryIter` and `QueryCombinationIter`. - Add tests to `QueryCombinationIter` when it shouldn't be `ExactSizeIterator` --- ## Changelog - Added `ExactSizeIterator` implementation for `QueryCombinatonIter`
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
…er (bevyengine#5214) # Objective Fix bevyengine#5149 ## Solution Instead of returning the **total count** of elements in the `QueryIter` in `size_hint`, we return the **count of remaining elements**. This Fixes bevyengine#5149 even when bevyengine#5148 gets merged. - bevyengine#5149 - bevyengine#5148 --- ## Changelog - Fix partially consumed `QueryIter` and `QueryCombinationIter` having invalid `size_hint` Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Following #5124 I decided to add the
ExactSizeIteratorimpl forQueryCombinationIter.Also:
size_hintandlenfor both the normalQueryIterandQueryCombinationIter.QueryCombinationIterwhen it shouldn't beExactSizeIteratorChangelog
ExactSizeIteratorimplementation forQueryCombinatonIter