fix codecov

Author: jangorecki

R/frollapply.R

@@ -171,7 +171,7 @@ frollapply = function(X, N, FUN, ..., by.column=TRUE, fill=NA, align=c("right","
       nn = length(N)
       nnam = names(N)
     } else
-      stopf("'N' must be integer vector or list of integer vectors")
+      stopf("n must be an integer vector or list of an integer vectors")
   }
   ## partial
   if (partial) {
@@ -290,12 +290,14 @@ frollapply = function(X, N, FUN, ..., by.column=TRUE, fill=NA, align=c("right","
         jobs = vector("integer", ths)
         for (th in seq_len(ths)) {
           jobs[th] = parallel::mcparallel({
+            # nocov start ## fork processes seem not to be tracked by codecov
             setDTthreads(1L)       ## disable nested parallelism
             lapply(ii[[th]],       ## loops over indexes for that thread
                    FUN = tight,    ## handles adaptive and by.column
                    dest = cpy(w),  ## allocate own window for each thread
                    src = thisx,    ## full input
                    n = thisn)      ## scalar or in adaptive case a vector
+            # nocov end
           })[["pid"]]
         }
       } else { ## windows || getDTthreads()==1L

inst/tests/froll.Rraw

@@ -1291,6 +1291,12 @@ test(6010.545, frollapply(1:2, 2, sum, simplify=NA), error="must be TRUE or FALS
 test(6010.561, frollapply(x=1:2, N=2, FUN=sum), c(NA,3L), warning="'x' is deprecated in frollapply, use 'X' instead")
 test(6010.562, frollapply(X=1:2, n=2, FUN=sum), c(NA,3L), warning="'n' is deprecated in frollapply, use 'N' instead")
 test(6010.563, frollapply(x=1:2, n=2, FUN=sum), c(NA,3L), warning=c("'x' is deprecated in frollapply, use 'X' instead","'n' is deprecated in frollapply, use 'N' instead"))
+test(6010.564, frollapply(1:2, c("a","a"), length, adaptive=TRUE), error="n must be an integer vector or list of an integer vectors")
+test(6010.565, frollapply(1:2, list(c("a","a")), length, adaptive=TRUE), error="n must be an integer vector or list of an integer vectors")
+test(6010.566, frollapply(1:2, 2, length, by.column=FALSE), error="frollapply by.column=FALSE requires 'X' argument to be")
+test(6010.567, frollapply(list(1:2, list(c("a","b"))), 2, length, by.column=FALSE), error="frollapply by.column=FALSE got list in 'X' but it is not valid one")
+test(6010.568, frollapply(list(data.frame(x=1:2), data.frame(x=I(list(1:2)))), 2, length, by.column=FALSE), error="not all columns of data.frames/data.tables are atomic")
+test(6010.569, frollapply(list(1:2, NULL), 2, length), error="argument to be atomic or a list of those")
 
 ## by.column
 x = data.table(v1=1:5, v2=2:6/2)
@@ -1300,6 +1306,9 @@ test(6010.603, frollapply(x, 3, FUN=tail, 1L, by.column=FALSE, partial=TRUE), x)
 test(6010.604, frollapply(x, 3, dim, by.column=FALSE, partial=TRUE), data.table(V1=c(1:3,3L,3L), V2=c(2L,2L,2L,2L,2L))) ## fill is not used in partial
 test(6010.605, frollapply(x, 3, function(x) setNames(dim(x), c("rows","cols")), by.column=FALSE, partial=TRUE), data.table(rows=c(1:3,3L,3L), cols=c(2L,2L,2L,2L,2L)))
 test(6010.606, frollapply(x, rep(3,5), dim, by.column=FALSE, fill=c(rows=NA_integer_, cols=NA_integer_), adaptive=TRUE, align="left"), data.table(rows=c(3L,3L,3L,NA,NA), cols=c(2L,2L,2L,NA,NA)))
+test(6010.6061, frollapply(as.data.frame(x), rep(3,5), dim, by.column=FALSE, fill=c(rows=NA_integer_, cols=NA_integer_), adaptive=TRUE, align="left", simplify=function(x) as.data.frame(do.call("rbind",x))), data.frame(rows=c(3L,3L,3L,NA,NA), cols=c(2L,2L,2L,NA,NA)))
+test(6010.6062, frollapply(as.list(x), rep(3,5), function(x) c(length(x[[1L]]), length(x)), by.column=FALSE, fill=c(rows=NA_integer_, cols=NA_integer_), adaptive=TRUE, align="left", simplify=function(x) setNames(transpose(x), c("rows","cols"))), list(rows=c(3L,3L,3L,NA,NA), cols=c(2L,2L,2L,NA,NA)))
+
 #### empty input
 test(6010.607, frollapply(list(), 3, identity, by.column=FALSE), list())
 test(6010.608, frollapply(list(numeric(), numeric()), 3, identity, by.column=FALSE), list())
@@ -1352,7 +1361,7 @@ test(6010.653, y = ans, x = lapply(
 ))
 rm(X, ans, n)
 
-## simplify
+## simplify simplifyList
 test(6010.701, frollapply(1:5, 2, sum), c(NA,3L,5L,7L,9L))
 test(6010.702, frollapply(1:5, 2, sum, simplify=unlist), c(NA,3L,5L,7L,9L))
 test(6010.703, frollapply(1:5, 2, sum, simplify=FALSE), list(NA,3L,5L,7L,9L))
@@ -1364,6 +1373,9 @@ test(6010.708, frollapply(1:5, 2, range, fill=c(min=NA_integer_, max=NA_integer_
 test(6010.709, frollapply(1:5, 2, function(x) as.list(range(x)), fill=list(min=NA_integer_, max=NA_integer_)), data.table(min=c(NA,1:4), max=c(NA,2:5)))
 test(6010.710, frollapply(1:5, 2, function(x) as.list(range(x)), fill=list(min=NA_integer_, max=NA_integer_), simplify=rbindlist), data.table(min=c(NA,1:4), max=c(NA,2:5)))
 test(6010.711, frollapply(1:5, 2, function(x) as.list(range(x)), fill=list(NA_integer_, NA_integer_), simplify=FALSE), list(list(NA_integer_, NA_integer_), as.list(1:2), as.list(2:3), as.list(3:4), as.list(4:5)))
+test(6010.712, as.null(frollapply(1:3, 1, function(x) if (x==1L) sum else if (x==2L) mean else `[`, simplify=TRUE)), NULL) ## as.null as we are only interested in codecov here
+test(6010.713, as.null(frollapply(1:3, 1, function(x) `[`, simplify = TRUE)), NULL) ## as.null as we are only interested in codecov here
+
 #### fixing .internal.selfref
 use.fork = .Platform$OS.type!="windows" && getDTthreads()>1L
 if (use.fork) {

src/frollapply.c

@@ -39,6 +39,7 @@ SEXP memcpyVector(SEXP dest, SEXP src, SEXP offset, SEXP size) {
   MEMCPY
   return dest;
 }
+// # nocov start ## does not seem to be reported to codecov most likely due to running in a fork, I manually debugged that the is being called from R when running froll.Rraw
 SEXP memcpyDT(SEXP dest, SEXP src, SEXP offset, SEXP size) {
   size_t o = INTEGER(offset)[0] - INTEGER(size)[0];
   int ncol = LENGTH(dest), nrow = LENGTH(VECTOR_ELT(dest, 0));
@@ -50,6 +51,7 @@ SEXP memcpyDT(SEXP dest, SEXP src, SEXP offset, SEXP size) {
   }
   return dest;
 }
+// # nocov end
 
 SEXP memcpyVectoradaptive(SEXP dest, SEXP src, SEXP offset, SEXP size) {
   size_t oi = INTEGER(offset)[0];
@@ -60,6 +62,7 @@ SEXP memcpyVectoradaptive(SEXP dest, SEXP src, SEXP offset, SEXP size) {
   MEMCPY
   return dest;
 }
+// # nocov start ## does not seem to be reported to codecov most likely due to running in a fork, I manually debugged that the is being called from R when running froll.Rraw
 SEXP memcpyDTadaptive(SEXP dest, SEXP src, SEXP offset, SEXP size) {
   size_t oi = INTEGER(offset)[0];
   int nrow = INTEGER(size)[oi-1];
@@ -74,6 +77,7 @@ SEXP memcpyDTadaptive(SEXP dest, SEXP src, SEXP offset, SEXP size) {
   }
   return dest;
 }
+// # nocov end
 
 // needed in adaptive=TRUE
 SEXP setgrowable(SEXP x) {