Skip to content

simplify hour() etc for ITime #3782

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
Aug 30, 2019
Merged

simplify hour() etc for ITime #3782

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
b28ea24
Closes #3158 -- simplify hour() etc for ITime
Aug 20, 2019
5fe8ebe
Merge branch 'master' into fast_itime
Aug 29, 2019
6a3a860
Merge branch 'master' into fast_itime
mattdowle Aug 30, 2019
e346893
coverage
mattdowle Aug 30, 2019
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 @@ -299,6 +299,8 @@

18. Added a note to `?setkey` clarifying that `setkey` always uses C-locale sorting (as has been noted in `?setorder`). Thanks @JBreidaks for the report in [#2114](https://github.com/Rdatatable/data.table/issues/2114).

19. `hour()`/`minute()`/`second()` are much faster for `ITime` input, [#3518](https://github.com/Rdatatable/data.table/issues/3158).


### Changes in [v1.12.2](https://github.com/Rdatatable/data.table/milestone/14?closed=1) (07 Apr 2019)

Expand Down
30 changes: 12 additions & 18 deletions R/IDateTime.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,28 +303,22 @@ as.POSIXlt.ITime = function(x, ...) {
###################################################################

second = function(x) {
if (inherits(x, 'POSIXct') && identical(attr(x, 'tzone', exact=TRUE), 'UTC')) {
# if we know the object is in UTC, can calculate the hour much faster
as.integer(as.numeric(x) %% 60L)
} else {
as.integer(as.POSIXlt(x)$sec)
}
# if we know the object is in UTC, can calculate the hour much faster
if (inherits(x, 'POSIXct') && identical(attr(x, 'tzone', exact=TRUE), 'UTC')) return(as.integer(as.numeric(x) %% 60L))
if (inherits(x, 'ITime')) return(as.integer(x) %% 60L)
as.integer(as.POSIXlt(x)$sec)
}
minute = function(x) {
if (inherits(x, 'POSIXct') && identical(attr(x, 'tzone', exact=TRUE), 'UTC')) {
# ever-so-slightly faster than x %% 3600L %/% 60L
as.integer(as.numeric(x) %/% 60L %% 60L)
} else {
as.POSIXlt(x)$min
}
# ever-so-slightly faster than x %% 3600L %/% 60L
if (inherits(x, 'POSIXct') && identical(attr(x, 'tzone', exact=TRUE), 'UTC')) return(as.integer(as.numeric(x) %/% 60L %% 60L))
if (inherits(x, 'ITime')) return(as.integer(x) %/% 60L %% 60L)
as.POSIXlt(x)$min
}
hour = function(x) {
if (inherits(x, 'POSIXct') && identical(attr(x, 'tzone', exact=TRUE), 'UTC')) {
# ever-so-slightly faster than x %% 86400L %/% 3600L
as.integer(as.numeric(x) %/% 3600L %% 24L)
} else {
as.POSIXlt(x)$hour
}
# ever-so-slightly faster than x %% 86400L %/% 3600L
if (inherits(x, 'POSIXct') && identical(attr(x, 'tzone', exact=TRUE), 'UTC')) return(as.integer(as.numeric(x) %/% 3600L %% 24L))
if (inherits(x, 'ITime')) return(as.integer(x) %/% 3600L %% 24L)
as.POSIXlt(x)$hour
}
yday = function(x) as.POSIXlt(x)$yday + 1L
wday = function(x) (unclass(as.IDate(x)) + 4L) %% 7L + 1L
Expand Down
4 changes: 4 additions & 0 deletions inst/tests/tests.Rraw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13361,6 +13361,10 @@ z = .POSIXct(3725, 'UTC')
test(1962.101, second(z), 5L)
test(1962.102, minute(z), 2L)
test(1962.103, hour(z), 1L)
z = as.ITime(z)
test(1962.201, second(z), 5L)
test(1962.202, minute(z), 2L)
test(1962.203, hour(z), 1L)

# positive and negative values for shift, #1708
DT = data.table(x = 1:10, y = 10:1)
Expand Down