From 09abfdb38399f183f16ab7ed073c11f029102f28 Mon Sep 17 00:00:00 2001 From: earowang Date: Wed, 3 Jun 2020 21:16:30 +1200 Subject: [PATCH] resubmit to cran --- CRAN-RELEASE | 4 ++-- NAMESPACE | 4 ---- R/vctrs-tsibble.R | 42 +++++++++++++++++++++--------------------- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/CRAN-RELEASE b/CRAN-RELEASE index 3675616a..992b3bd2 100644 --- a/CRAN-RELEASE +++ b/CRAN-RELEASE @@ -1,2 +1,2 @@ -This package was submitted to CRAN on 2020-06-01. -Once it is accepted, delete this file and tag the release (commit c8ed20af16). +This package was submitted to CRAN on 2020-06-03. +Once it is accepted, delete this file and tag the release (commit c837e83961). diff --git a/NAMESPACE b/NAMESPACE index c9d91822..8d349e85 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -164,8 +164,6 @@ S3method(vec_cast,tbl_ts.tbl_ts) S3method(vec_cast,yearmonth.yearmonth) S3method(vec_cast,yearquarter.yearquarter) S3method(vec_cast,yearweek.yearweek) -S3method(vec_proxy,grouped_ts) -S3method(vec_proxy,tbl_ts) S3method(vec_ptype2,Date.yearmonth) S3method(vec_ptype2,Date.yearquarter) S3method(vec_ptype2,Date.yearweek) @@ -189,8 +187,6 @@ S3method(vec_ptype2,yearweek.yearweek) S3method(vec_ptype_abbr,yearmonth) S3method(vec_ptype_abbr,yearquarter) S3method(vec_ptype_abbr,yearweek) -S3method(vec_restore,grouped_ts) -S3method(vec_restore,tbl_ts) S3method(year,yearweek) S3method(yearmonth,"NULL") S3method(yearmonth,Date) diff --git a/R/vctrs-tsibble.R b/R/vctrs-tsibble.R index a7499510..86644932 100644 --- a/R/vctrs-tsibble.R +++ b/R/vctrs-tsibble.R @@ -90,24 +90,24 @@ vec_cast.data.frame.tbl_ts <- function(x, to, ...) { df_cast(x, to, ...) } -#' @export -vec_restore.tbl_ts <- function(x, to, ..., n = NULL) { - # assuming `i` in order and no duplicates, minimal check for performance reason - build_tsibble(x, - key = key_vars(to), index = index_var(to), index2 = index2_var(to), - ordered = TRUE, validate = FALSE, .drop = key_drop_default(to)) -} - -#' @export -vec_proxy.tbl_ts <- function(x, ...) { - new_data_frame(x) -} - -#' @export -vec_restore.grouped_ts <- function(x, to, ..., n = NULL) { - x <- NextMethod() - vec_restore.tbl_ts(x, to) -} - -#' @export -vec_proxy.grouped_ts <- vec_proxy.tbl_ts +# #' @export +# vec_restore.tbl_ts <- function(x, to, ..., n = NULL) { +# # assuming `i` in order and no duplicates, minimal check for performance reason +# build_tsibble(x, +# key = key_vars(to), index = index_var(to), index2 = index2_var(to), +# ordered = TRUE, validate = FALSE, .drop = key_drop_default(to)) +# } +# +# #' @export +# vec_proxy.tbl_ts <- function(x, ...) { +# new_data_frame(x) +# } +# +# #' @export +# vec_restore.grouped_ts <- function(x, to, ..., n = NULL) { +# x <- NextMethod() +# vec_restore.tbl_ts(x, to) +# } +# +# #' @export +# vec_proxy.grouped_ts <- vec_proxy.tbl_ts