From 32972713646da48f5227f29a564fa8086e0cfc5e Mon Sep 17 00:00:00 2001 From: Simon Garnier Date: Sat, 25 Mar 2023 16:56:54 -0400 Subject: [PATCH 1/3] Fix CRAN checks with R devel. --- DESCRIPTION | 4 ++-- NAMESPACE | 6 ++---- R/tidyverse.R | 30 ++++++++++++------------------ docs/404.html | 2 +- docs/LICENSE-text.html | 2 +- docs/articles/index.html | 2 +- docs/articles/z1_install.html | 2 +- docs/articles/z2_build.html | 24 ++++++++++++------------ docs/articles/z3_manipulate.html | 4 ++-- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 4 ++-- docs/pkgdown.yml | 4 ++-- docs/reference/conversions.html | 2 +- docs/reference/index.html | 4 ++-- docs/reference/is_geo.html | 2 +- docs/reference/is_track.html | 2 +- docs/reference/n_dims.html | 2 +- docs/reference/n_tracks.html | 2 +- docs/reference/projection.html | 2 +- docs/reference/short_tracks.html | 2 +- docs/reference/sub-.track.html | 2 +- docs/reference/track_.html | 2 +- docs/reference/tracks.html | 2 +- docs/search.json | 2 +- man/dplyr_track.Rd | 29 +++++++++++++---------------- 26 files changed, 66 insertions(+), 77 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8cc05b7..2fd84d7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: trackdf Type: Package Title: Data Frame Class for Tracking Data -Version: 0.3.1 -Date: 2023-01-22 +Version: 0.3.2 +Date: 2023-03-25 Authors@R: c( person("Simon", "Garnier", email = "garnier@njit.edu", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-3886-3974")) diff --git a/NAMESPACE b/NAMESPACE index 932f194..9075977 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -29,11 +29,10 @@ S3method(print,track) S3method(rename,track) S3method(right_join,track) S3method(rowwise,track) -S3method(sample_frac,track) -S3method(sample_n,track) S3method(select,track) S3method(semi_join,track) S3method(slice,track) +S3method(slice_sample,track) S3method(summarise,track) S3method(summarize,track) S3method(transmute,track) @@ -74,11 +73,10 @@ importFrom(dplyr,nest_join) importFrom(dplyr,rename) importFrom(dplyr,right_join) importFrom(dplyr,rowwise) -importFrom(dplyr,sample_frac) -importFrom(dplyr,sample_n) importFrom(dplyr,select) importFrom(dplyr,semi_join) importFrom(dplyr,slice) +importFrom(dplyr,slice_sample) importFrom(dplyr,summarise) importFrom(dplyr,summarize) importFrom(dplyr,transmute) diff --git a/R/tidyverse.R b/R/tidyverse.R index 0c1f3ae..799c89c 100644 --- a/R/tidyverse.R +++ b/R/tidyverse.R @@ -49,7 +49,7 @@ #' #' @description \code{\link[dplyr]{dplyr}} methods for track tables objects. #' -#' @param .data A track table. +#' @param data,.data,x A track table. #' #' @param ... Additional arguments to be passed to the corresponding #' \code{\link[dplyr]{dplyr}} method. @@ -125,19 +125,13 @@ group_by.track <- function(.data, ...) .reclass(.data, NextMethod()) #' @rdname dplyr_track #' #' @export -ungroup.track <- function(.data, ...) .reclass(.data, NextMethod()) +ungroup.track <- function(x, ...) .reclass(x, NextMethod()) -#' @importFrom dplyr sample_n +#' @importFrom dplyr slice_sample #' @rdname dplyr_track #' #' @export -sample_n.track <- function(.data, ...) .reclass(.data, NextMethod()) - -#' @importFrom dplyr sample_frac -#' @rdname dplyr_track -#' -#' @export -sample_frac.track <- function(.data, ...) .reclass(.data, NextMethod()) +slice_sample.track <- function(.data, ...) .reclass(.data, NextMethod()) #' @importFrom dplyr do #' @rdname dplyr_track @@ -155,43 +149,43 @@ slice.track <- function(.data, ...) .reclass(.data, NextMethod()) #' @rdname dplyr_track #' #' @export -semi_join.track <- function(.data, ...) .reclass(.data, NextMethod()) +semi_join.track <- function(x, ...) .reclass(x, NextMethod()) #' @importFrom dplyr anti_join #' @rdname dplyr_track #' #' @export -anti_join.track <- function(.data, ...) .reclass(.data, NextMethod()) +anti_join.track <- function(x, ...) .reclass(x, NextMethod()) #' @importFrom dplyr inner_join #' @rdname dplyr_track #' #' @export -inner_join.track <- function(.data, ...) .reclass(.data, NextMethod()) +inner_join.track <- function(x, ...) .reclass(x, NextMethod()) #' @importFrom dplyr left_join #' @rdname dplyr_track #' #' @export -left_join.track <- function(.data, ...) .reclass(.data, NextMethod()) +left_join.track <- function(x, ...) .reclass(x, NextMethod()) #' @importFrom dplyr right_join #' @rdname dplyr_track #' #' @export -right_join.track <- function(.data, ...) .reclass(.data, NextMethod()) +right_join.track <- function(x, ...) .reclass(x, NextMethod()) #' @importFrom dplyr full_join #' @rdname dplyr_track #' #' @export -full_join.track <- function(.data, ...) .reclass(.data, NextMethod()) +full_join.track <- function(x, ...) .reclass(x, NextMethod()) #' @importFrom dplyr nest_join #' @rdname dplyr_track #' #' @export -nest_join.track <- function(.data, ...) .reclass(.data, NextMethod()) +nest_join.track <- function(x, ...) .reclass(x, NextMethod()) #' @importFrom dplyr distinct #' @rdname dplyr_track @@ -203,4 +197,4 @@ distinct.track <- function(.data, ...) .reclass(.data, NextMethod()) #' @rdname dplyr_track #' #' @export -rowwise.track <- function(.data, ...) .reclass(.data, NextMethod()) +rowwise.track <- function(data, ...) .reclass(data, NextMethod()) diff --git a/docs/404.html b/docs/404.html index ebaca83..9019cf4 100644 --- a/docs/404.html +++ b/docs/404.html @@ -31,7 +31,7 @@ trackdf - 0.3.1 + 0.3.2