Merge pull request #17 from swarm-lab/develop

Develop

Author: sjmgarnier

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"))

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)

NEWS.md

@@ -1,3 +1,15 @@
+# trackdf 0.3.2
+
+## New features
+
+* N/A.
+
+## Minor improvements and fixes
+
+* Fixes CRAN check warnings with R-devel. 
+
+---
+
 # trackdf 0.3.1
 
 ## New features

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())

cran-comments.md

@@ -1,8 +1,8 @@
 ## Test environments
 
-* local OS X 13.1, R 4.2.2 + devel
-* local Windows 10, R 4.2.2 + devel
-* local Ubuntu 22.04, R 4.2.2 + devel
+* local OS X 13.1, R 4.2.3 + devel
+* local Windows 10, R 4.2.3 + devel
+* local Ubuntu 22.04, R 4.2.3 + devel
 * Github Actions "windows-latest (release)"
 * Github Actions "macOS-latest (release)"
 * Github Actions "ubuntu-22.04-latest (release)"