Skip to content

Commit a27af12

Browse files
author
admin
committed
Updated [.epi_df
1 parent 3a34343 commit a27af12

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

NAMESPACE

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Generated by roxygen2: do not edit by hand
22

3+
S3method("[",epi_df)
34
S3method(arrange,epi_df)
45
S3method(as_epi_df,data.frame)
56
S3method(as_epi_df,epi_df)
@@ -79,5 +80,3 @@ importFrom(tidyr,unnest)
7980
importFrom(tidyselect,eval_select)
8081
importFrom(tidyselect,starts_with)
8182
importFrom(tsibble,as_tsibble)
82-
importFrom(utils,head)
83-
importFrom(utils,tail)

R/methods-epi_df.R

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,14 @@ summary.epi_df = function(object, ...) {
9999

100100
cn <- names(res)
101101
nr <- vctrs::vec_size(x)
102-
not_epi_df <- (!("time_value" %in% cn) || !("geo_value" %in% cn)
103-
|| vctrs::vec_size(res) > nr || any(i > nr))
102+
not_epi_df <- (!("time_value" %in% cn) || !("geo_value" %in% cn) || vctrs::vec_size(res) > nr || any(i > nr))
104103

105104
if (not_epi_df) return(tibble::as_tibble(res))
106105

107106
# Case when i is numeric and there are duplicate values in it
108107
if (is.numeric(i) && vctrs::vec_duplicate_any(i) > 0)
109108
return(tibble::as_tibble(res))
110109

111-
# Column subsetting only, then return res as tibble
112-
if (rlang::is_null(i) && !rlang::is_null(j))
113-
return(tibble::as_tibble(res))
114-
115110
att_x = attr(x, "metadata")
116111
new_epi_df(tibble::as_tibble(res),
117112
geo_type = att_x$geo_type,

tests/testthat/test-epi_slide.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ test_that("`ref_time_values` + `align` that have some slide data, but generate t
2727
test_that("these doesn't produce an error; the error appears only if the ref time values are out of the range for every group", {
2828
expect_identical(edf %>% group_by(geo_value) %>% epi_slide(f, n=3L, ref_time_values=as.Date("2020-01-01")+200L) %>%
2929
dplyr::select("geo_value","slide_value_value"),
30-
dplyr::tibble(geo_value = "ak", slide_value_value = 199) %>% group_by(geo_value)) # out of range for one group
30+
dplyr::tibble(geo_value = "ak", slide_value_value = 199)) # out of range for one group
3131
expect_identical(edf %>% group_by(geo_value) %>% epi_slide(f, n=3L, ref_time_values=as.Date("2020-01-04")) %>%
3232
dplyr::select("geo_value","slide_value_value"),
33-
dplyr::tibble(geo_value = c("ak", "al"), slide_value_value = c(2, -2)) %>% group_by(geo_value)) # not out of range for either group
33+
dplyr::tibble(geo_value = c("ak", "al"), slide_value_value = c(2, -2))) # not out of range for either group
3434
})

0 commit comments

Comments
 (0)