performance improvements in data.frame methods

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: quantities
 Type: Package
 Title: Quantity Calculus for R Vectors
-Version: 0.2.1
+Version: 0.2.1.1
 Authors@R: c(
     person("Iñaki", "Ucar", email="[email protected]",
       role=c("aut", "cph", "cre"), comment=c(ORCID="0000-0001-6403-5550")))
@@ -22,6 +22,6 @@ Suggests: dplyr (>= 1.0.0), vctrs (>= 0.5.0), tidyr, pillar, ggplot2 (> 3.2.1),
     testthat, vdiffr, knitr, rmarkdown
 LinkingTo: Rcpp (>= 0.12.10)
 ByteCompile: yes
-RoxygenNote: 7.2.2
+RoxygenNote: 7.2.3
 Roxygen: list(old_usage = TRUE)
 VignetteBuilder: knitr

NEWS.md

@@ -1,3 +1,7 @@
+# quantities devel
+
+- Performance improvements for `data.frame` methods.
+
 # quantities 0.2.1
 
 - Fix a couple of tests (r-quantities/units#324).

R/drop.R

@@ -30,9 +30,5 @@ drop_errors.quantities <- drop_units.quantities
 #' @name drop_quantities
 #' @export
 drop_quantities.data.frame <- function(x) {
-  for (i in seq_along(x)) {
-    if (inherits(x[[i]], "quantities"))
-      x[[i]] <- drop_quantities(x[[i]])
-  }
-  x
+  dfapply(x, function(i) if (inherits(i, "quantities")) drop_quantities(i) else i)
 }

R/misc.R

@@ -86,18 +86,8 @@ diff.quantities <- function(x, lag = 1L, differences = 1L, ...) reclass(NextMeth
 #' as.data.frame(z)
 #'
 #' @export
-as.data.frame.quantities <- function(x, row.names = NULL, optional = FALSE, ...) {
-  e <- errors(x)
-  dim(e) <- dim(x)
-  e <- as.data.frame(e)
-  value <- NextMethod()
-  if (!optional && ncol(value) == 1)
-    colnames(value) <- deparse(substitute(x))
-  for (i in seq_len(ncol(value))) {
-    value[[i]] <- reclass(value[[i]])
-    errors(value[[i]]) <- e[[i]]
-  }
-  value
+as.data.frame.quantities <- function(x, ...) {
+  dfapply(as.data.frame(drop_units(x), ...), as_units, units(x))
 }
 
 #' Coerce to a List

R/utils.R

@@ -3,3 +3,10 @@ reclass <- function(x) {
     class(x) <- c("quantities", "units", "errors")
   x
 }
+
+dfapply <- function(X, FUN, ...) {
+  attrs <- attributes(X)
+  X <- lapply(X, FUN, ...)
+  attributes(X) <- attrs
+  X
+}