From 2db7d87a923f20e17f67eddd4a7f9276dd3ef6f2 Mon Sep 17 00:00:00 2001 From: Norwin Roosen Date: Sat, 13 Jan 2018 15:13:39 +0100 Subject: [PATCH] remove deprecated NSE functions from dplyr --- NAMESPACE | 4 ---- R/box_utils.R | 15 +++++++++++---- R/measurement_utils.R | 15 +++++++++++---- man/filter.osem_measurements.Rd | 21 +++++++++++++++++++++ man/filter.sensebox.Rd | 21 +++++++++++++++++++++ man/mutate.osem_measurements.Rd | 21 +++++++++++++++++++++ man/mutate.sensebox.Rd | 21 +++++++++++++++++++++ 7 files changed, 106 insertions(+), 12 deletions(-) create mode 100644 man/filter.osem_measurements.Rd create mode 100644 man/filter.sensebox.Rd create mode 100644 man/mutate.osem_measurements.Rd create mode 100644 man/mutate.sensebox.Rd diff --git a/NAMESPACE b/NAMESPACE index ff8f689..bdd93a5 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -13,12 +13,8 @@ S3method(print,sensebox) S3method(summary,sensebox) export(filter.osem_measurements) export(filter.sensebox) -export(filter_.osem_measurements) -export(filter_.sensebox) export(mutate.osem_measurements) export(mutate.sensebox) -export(mutate_.osem_measurements) -export(mutate_.sensebox) export(osem_as_measurements) export(osem_as_sensebox) export(osem_box) diff --git a/R/box_utils.R b/R/box_utils.R index bc4e2c2..8992ba7 100644 --- a/R/box_utils.R +++ b/R/box_utils.R @@ -84,12 +84,19 @@ osem_as_sensebox = function(x) { ret } -#' @export -filter_.sensebox = dplyr_class_wrapper(osem_as_sensebox) +#' Return rows with matching conditions, while maintaining class & attributes +#' @param .data A sensebox data.frame to filter +#' @param .dots see corresponding function in package \code{\link{dplyr}} +#' @param ... other arguments +#' @seealso \code{\link[dplyr]{filter}} #' @export filter.sensebox = dplyr_class_wrapper(osem_as_sensebox) -#' @export -mutate_.sensebox = dplyr_class_wrapper(osem_as_sensebox) + +#' Add new variables to the data, while maintaining class & attributes +#' @param .data A sensebox data.frame to mutate +#' @param .dots see corresponding function in package \code{\link{dplyr}} +#' @param ... other arguments +#' @seealso \code{\link[dplyr]{mutate}} #' @export mutate.sensebox = dplyr_class_wrapper(osem_as_sensebox) diff --git a/R/measurement_utils.R b/R/measurement_utils.R index 485e424..e7acc83 100644 --- a/R/measurement_utils.R +++ b/R/measurement_utils.R @@ -22,12 +22,19 @@ osem_as_measurements = function(x) { ret } -#' @export -filter_.osem_measurements = dplyr_class_wrapper(osem_as_measurements) +#' Return rows with matching conditions, while maintaining class & attributes +#' @param .data A osem_measurements data.frame to filter +#' @param .dots see corresponding function in package \code{\link{dplyr}} +#' @param ... other arguments +#' @seealso \code{\link[dplyr]{filter}} #' @export filter.osem_measurements = dplyr_class_wrapper(osem_as_measurements) -#' @export -mutate_.osem_measurements = dplyr_class_wrapper(osem_as_measurements) + +#' Add new variables to the data, while maintaining class & attributes +#' @param .data A osem_measurements data.frame to mutate +#' @param .dots see corresponding function in package \code{\link{dplyr}} +#' @param ... other arguments +#' @seealso \code{\link[dplyr]{mutate}} #' @export mutate.osem_measurements = dplyr_class_wrapper(osem_as_measurements) diff --git a/man/filter.osem_measurements.Rd b/man/filter.osem_measurements.Rd new file mode 100644 index 0000000..e05ea6d --- /dev/null +++ b/man/filter.osem_measurements.Rd @@ -0,0 +1,21 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/measurement_utils.R +\name{filter.osem_measurements} +\alias{filter.osem_measurements} +\title{Return rows with matching conditions, while maintaining class & attributes} +\usage{ +filter.osem_measurements(.data, ..., .dots) +} +\arguments{ +\item{.data}{A osem_measurements data.frame to filter} + +\item{...}{other arguments} + +\item{.dots}{see corresponding function in package \code{\link{dplyr}}} +} +\description{ +Return rows with matching conditions, while maintaining class & attributes +} +\seealso{ +\code{\link[dplyr]{filter}} +} diff --git a/man/filter.sensebox.Rd b/man/filter.sensebox.Rd new file mode 100644 index 0000000..63fb42c --- /dev/null +++ b/man/filter.sensebox.Rd @@ -0,0 +1,21 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/box_utils.R +\name{filter.sensebox} +\alias{filter.sensebox} +\title{Return rows with matching conditions, while maintaining class & attributes} +\usage{ +filter.sensebox(.data, ..., .dots) +} +\arguments{ +\item{.data}{A sensebox data.frame to filter} + +\item{...}{other arguments} + +\item{.dots}{see corresponding function in package \code{\link{dplyr}}} +} +\description{ +Return rows with matching conditions, while maintaining class & attributes +} +\seealso{ +\code{\link[dplyr]{filter}} +} diff --git a/man/mutate.osem_measurements.Rd b/man/mutate.osem_measurements.Rd new file mode 100644 index 0000000..6afaa3e --- /dev/null +++ b/man/mutate.osem_measurements.Rd @@ -0,0 +1,21 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/measurement_utils.R +\name{mutate.osem_measurements} +\alias{mutate.osem_measurements} +\title{Add new variables to the data, while maintaining class & attributes} +\usage{ +mutate.osem_measurements(.data, ..., .dots) +} +\arguments{ +\item{.data}{A osem_measurements data.frame to mutate} + +\item{...}{other arguments} + +\item{.dots}{see corresponding function in package \code{\link{dplyr}}} +} +\description{ +Add new variables to the data, while maintaining class & attributes +} +\seealso{ +\code{\link[dplyr]{mutate}} +} diff --git a/man/mutate.sensebox.Rd b/man/mutate.sensebox.Rd new file mode 100644 index 0000000..4f923ad --- /dev/null +++ b/man/mutate.sensebox.Rd @@ -0,0 +1,21 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/box_utils.R +\name{mutate.sensebox} +\alias{mutate.sensebox} +\title{Add new variables to the data, while maintaining class & attributes} +\usage{ +mutate.sensebox(.data, ..., .dots) +} +\arguments{ +\item{.data}{A sensebox data.frame to mutate} + +\item{...}{other arguments} + +\item{.dots}{see corresponding function in package \code{\link{dplyr}}} +} +\description{ +Add new variables to the data, while maintaining class & attributes +} +\seealso{ +\code{\link[dplyr]{mutate}} +}