reduce diff, increase codecov precision, more tests

Author: jangorecki

R/frollapply.R

@@ -209,7 +209,8 @@ frollapply = function(X, N, FUN, ..., by.column=TRUE, fill=NA, align=c("right","
     cpy = copy
     ansMask = function(len, n) {
       mask = rep(TRUE, len)
-      if (n) mask[seq_len(n - 1L)] = FALSE ## handle n==0
+      if (n) ## handle n==0
+        mask[seq_len(n-1L)] = FALSE
       mask
     }
     tight0 = function(i, dest, src, n) FUN(dest, ...) ## skip memcpy when n==0
@@ -240,7 +241,7 @@ frollapply = function(X, N, FUN, ..., by.column=TRUE, fill=NA, align=c("right","
       if (has.growable) {
         tight = function(i, dest, src, n) FUN(.Call(CmemcpyVectoradaptive, dest, src, i, n), ...) # CmemcpyVectoradaptive handles k[i]==0
       } else {
-        tight = function(i, dest, src, n) {stopf("internal error: has.growable should be TRUE, if enabled it requires to implement support for n==0"); FUN(src[(i-n[i]+1L):i], ...)} # nocov
+        tight = function(i, dest, src, n) {stopf("internal error: has.growable should be TRUE, implement support for n==0"); FUN(src[(i-n[i]+1L):i], ...)} # nocov
       }
     } else {
       if (!list.df) {
@@ -252,9 +253,9 @@ frollapply = function(X, N, FUN, ..., by.column=TRUE, fill=NA, align=c("right","
         tight = function(i, dest, src, n) FUN(.Call(CmemcpyDTadaptive, dest, src, i, n), ...) # CmemcpyDTadaptive handles k[i]==0
       } else {
         if (!list.df) { # nocov
-          tight = function(i, dest, src, n) {stopf("internal error: has.growable should be TRUE, if enabled it requires to implement support for n==0"); FUN(src[(i-n[i]+1L):i, , drop=FALSE], ...)} # nocov
+          tight = function(i, dest, src, n) {stopf("internal error: has.growable should be TRUE, implement support for n==0"); FUN(src[(i-n[i]+1L):i, , drop=FALSE], ...)} # nocov
         } else {
-          tight = function(i, dest, src, n) {stopf("internal error: has.growable should be TRUE, if enabled it requires to implement support for n==0"); FUN(lapply(src, `[`, (i-n[i]+1L):i), ...)} # nocov
+          tight = function(i, dest, src, n) {stopf("internal error: has.growable should be TRUE, implement support for n==0"); FUN(lapply(src, `[`, (i-n[i]+1L):i), ...)} # nocov
         }
       }
     }
@@ -289,7 +290,11 @@ frollapply = function(X, N, FUN, ..., by.column=TRUE, fill=NA, align=c("right","
       w = allocWindow(thisx, thisn) ## prepare window, handles adaptive
       ansmask = ansMask(thislen, thisn)
       ansi = which(ansmask)
-      tightFUN = if (adaptive || thisn) tight else tight0 ## handle n==0 for !adaptive, for !adaptive thisn should be scalar
+      tightFUN = if (adaptive || thisn) { ## handle n==0 for !adaptive, for !adaptive thisn should be scalar
+        tight
+      }  else {
+        tight0
+      }
       if (use.fork) { ## !windows && getDTthreads()>1L
         ths = min(DTths, length(ansi))
         ii = split(ansi, sort(rep_len(seq_len(ths), length(ansi)))) ## assign row indexes to threads

inst/tests/froll.Rraw

@@ -369,7 +369,7 @@ test(6000.084, frollmean(list(1:3, numeric()), 2), list(c(NA_real_, 1.5, 2.5), n
 test(6000.085, frollmean(1:3, integer()), error="n must be non 0 length")
 test(6000.086, frollmean(list(1:3, 2:4), integer()), error="n must be non 0 length")
 #### n==0 (k==0, k[i]==0)
-##moved to 6001.
+## 6000.87 6000.88 moved to 6001.
 #### n<0
 test(6000.089, frollmean(1:3, -2), error="n must be non-negative integer values")
 #### n[[1L]]>0 && n[[2L]]<0
@@ -1593,8 +1593,10 @@ rollfun = function(x, n, FUN, fill=NA_real_, na.rm=FALSE, nf.rm=FALSE, partial=F
   f = match.fun(FUN)
   if (nf.rm) x[is.infinite(x)] = NA_real_
   for (i in seq_along(x)) {
-    ans[i] = if (i >= n)
-      f(x[(i-n+1):i], na.rm=na.rm)
+    ans[i] = if (n==0)
+      f(x[integer()], na.rm=na.rm)
+    else if (i >= n)
+      f(x[(i-n+1L):i], na.rm=na.rm)
     else if (partial)
       f(x[max((i-n+1), 1L):i], na.rm=na.rm)
     else
@@ -1647,6 +1649,8 @@ x = makeNA(rnorm(1e3), nf=TRUE); n = 51
 base_compare(x, n)
 x = makeNA(rnorm(1e3+1), nf=TRUE); n = 51
 base_compare(x, n)
+x = makeNA(rnorm(1e3), nf=TRUE); n = 0
+base_compare(x, n)
 
 #### against zoo
 if (requireNamespace("zoo", quietly=TRUE)) {
@@ -1730,14 +1734,18 @@ arollfun = function(FUN, x, n, na.rm=FALSE, align=c("right","left"), fill=NA, nf
   f = match.fun(FUN)
   if (align=="right") {
     for (i in seq_along(x)) {
-      if (i >= n[i])
+      if (n[i] == 0)
+        ans[i] = f(x[integer()], na.rm=na.rm)
+      else if (i >= n[i])
         ans[i] = f(x[(i-n[i]+1L):i], na.rm=na.rm)
       else if (partial)
         ans[i] = f(x[1L:i], na.rm=na.rm)
     }
   } else {
     for (i in seq_along(x)) {
-      if (i <= nx-n[i]+1)
+      if (n[i] == 0)
+        ans[i] = f(x[integer()], na.rm=na.rm)
+      else if (i <= nx-n[i]+1)
         ans[i] = f(x[i:(i+n[i]-1L)], na.rm=na.rm)
       else if (partial)
         ans[i] = f(x[i:length(x)], na.rm=na.rm)
@@ -1797,6 +1805,8 @@ x = rnorm(1e3); n = sample(51, length(x), TRUE) # x even, n odd
 afun_compare(x, n)
 x = rnorm(1e3+1); n = sample(51, length(x), TRUE) # x odd, n odd
 afun_compare(x, n)
+x = rnorm(1e3); n = sample(0:49, length(x), TRUE) # x even, n even
+afun_compare(x, n)
 #### leading and trailing NAs
 x = c(rep(NA, 60), rnorm(1e3), rep(NA, 60)); n = sample(50, length(x), TRUE)
 afun_compare(x, n)
@@ -1806,6 +1816,8 @@ x = c(rep(NA, 60), rnorm(1e3), rep(NA, 60)); n = sample(51, length(x), TRUE)
 afun_compare(x, n)
 x = c(rep(NA, 60), rnorm(1e3+1), rep(NA, 60)); n = sample(51, length(x), TRUE)
 afun_compare(x, n)
+x = c(rep(NA, 60), rnorm(1e3), rep(NA, 60)); n = sample(0:49, length(x), TRUE)
+afun_compare(x, n)
 #### random NA
 x = makeNA(rnorm(1e3)); n = sample(50, length(x), TRUE)
 afun_compare(x, n)
@@ -1815,6 +1827,8 @@ x = makeNA(rnorm(1e3)); n = sample(51, length(x), TRUE)
 afun_compare(x, n)
 x = makeNA(rnorm(1e3+1)); n = sample(51, length(x), TRUE)
 afun_compare(x, n)
+x = makeNA(rnorm(1e3)); n = sample(0:49, length(x), TRUE)
+afun_compare(x, n)
 #### random NA non-finites
 x = makeNA(rnorm(1e3), nf=TRUE); n = sample(50, length(x), TRUE)
 afun_compare(x, n)
@@ -1824,4 +1838,6 @@ x = makeNA(rnorm(1e3), nf=TRUE); n = sample(51, length(x), TRUE)
 afun_compare(x, n)
 x = makeNA(rnorm(1e3+1), nf=TRUE); n = sample(51, length(x), TRUE)
 afun_compare(x, n)
+x = makeNA(rnorm(1e3), nf=TRUE); n = sample(0:49, length(x), TRUE)
+afun_compare(x, n)
 rm(num)