Skip to content

fix tests for ties.method='last' to work on R 3.1 #4243

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

Merged
mattdowle merged 4 commits into from
Feb 15, 2020
Merged

fix tests for ties.method='last' to work on R 3.1 #4243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf1cdd7
fix tests to work on R 3.1
Feb 14, 2020
85a6b49
turned 'random' on in the loop and added back the two set.seed
mattdowle Feb 15, 2020
5d2847e
comment added to 1369 about 'random' with TODO
mattdowle Feb 15, 2020
518f39a
ties='random' with na.last=NA now consistent with base and test 1369 …
mattdowle Feb 15, 2020
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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ unit = "s")

4. `fifelse` and `fcase` notify users that S4 objects (except `nanotime`) are not supported [#4135](https://github.com/Rdatatable/data.table/issues/4135). Thanks to @torema-ed for bringing it to our attention and Morgan Jacob for the PR.

5. `frank(..., ties.method="random", na.last=NA)` now returns the same random ordering that `base::rank` does, [#4243](https://github.com/Rdatatable/data.table/pull/4243).


# data.table [v1.12.8](https://github.com/Rdatatable/data.table/milestone/15?closed=1) (09 Dec 2019)

Expand Down
9 changes: 6 additions & 3 deletions R/frank.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@ frankv = function(x, cols=seq_along(x), order=1L, na.last=TRUE, ties.method=c("a
nas = x[[ncol(x)]]
}
if (ties.method == "random") {
v = stats::runif(nrow(x))
if (is.na(na.last)) {
idx = which_(nas, FALSE)
set(x, idx, '..stats_runif..', v[idx])
} else set(x, NULL, '..stats_runif..', v)
n = length(idx) # changed in #4243 to match base R to pass test 1369
} else {
idx = NULL
n = nrow(x)
}
set(x, idx, '..stats_runif..', stats::runif(n))
order = if (length(order) == 1L) c(rep(order, length(cols)), 1L) else c(order, 1L)
cols = c(cols, ncol(x))
}
Expand Down
6 changes: 4 additions & 2 deletions inst/tests/tests.Rraw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5480,7 +5480,8 @@ test_no = 1368.0
for (i in seq_along(dt)) {
col = dt[[i]]
for (j in list(TRUE, FALSE, "keep")) {
for (k in c("average", "min", "max", "first", "last")) {
# ensure consistency with base::rank ties.methods as advertised
for (k in eval(formals(base::rank)$ties.method)) {
if (k == "random") set.seed(45L)
if (class(col) == "integer64") {
r1 = rank(as.integer(col), ties.method=k, na.last=j)
Expand Down Expand Up @@ -5511,7 +5512,8 @@ if (test_bit64) dt[, DD := as.integer64(DD)]
test_no = 1369.0
for (i in seq_along(dt)) {
col = dt[[i]]
for (k in c("average", "min", "max", "first", "last")) {
# ensure consistency with base::rank ties.methods as advertised
for (k in eval(formals(base::rank)$ties.method)) { # 'random' on now with tweak to match base in #4243
if (k == "random") set.seed(45L)
if (class(col) == "integer64") {
r1 = rank(as.integer(col), ties.method=k, na.last=NA)
Expand Down