Allow negative n/prop in slice_sample() #6405
Merged
Conversation
This file contains 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
eutwt
reviewed
Aug 16, 2022
DavisVaughan
approved these changes
Aug 18, 2022
Conflicts: R/slice.R
To avoid near future merge conflict
DavisVaughan
approved these changes
Aug 18, 2022
| @@ -423,48 +415,57 @@ check_slice_n_prop <- function(n, prop, error_call = caller_env()) { | |||
| list(type = "n", n = 1L) | |||
| } else if (!missing(n) && missing(prop)) { | |||
| n <- check_constant(n, "n", error_call = error_call) | |||
| if (!is.numeric(n) || length(n) != 1 || is.na(n)) { | |||
| abort("`n` must be a single number.", call = error_call) | |||
| if (!is_integerish(n, n = 1) || is.na(n)) { | |||
There was a problem hiding this comment.
Suggested change
| if (!is_integerish(n, n = 1) || is.na(n)) { | |
| if (!is_integerish(n, n = 1, finite = TRUE)) { |
This catches NA and NaN along with Inf/-Inf
There was a problem hiding this comment.
I think you can also just use check_number()
There was a problem hiding this comment.
Inf is explicitly allowed in the tests 😬
| abort( | ||
| glue("`n` must be a round number, not {obj_type_friendly(n)}."), | ||
| call = error_call | ||
| ) | ||
| } | ||
| list(type = "n", n = n) | ||
| } else if (!missing(prop) && missing(n)) { | ||
| prop <- check_constant(prop, "prop", error_call = error_call) | ||
| if (!is.numeric(prop) || length(prop) != 1 || is.na(prop)) { |
There was a problem hiding this comment.
Suggested change
| if (!is.numeric(prop) || length(prop) != 1 || is.na(prop)) { | |
| if (!is_integerish(prop, n = 1, finite = TRUE)) { |
eh?
There was a problem hiding this comment.
Prop isn't supposed to be an integer 😉
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #6402
This seems reasonable to me, and already in alignment with what the docs suggest — negative
propandndrop rows.