forget to remove wrapping into list, amend error for different types

Author: jangorecki

R/froll.R

@@ -50,11 +50,11 @@ partial2adaptive = function(x, n, align, adaptive) {
   } else {
     if (!(is.numeric(n) || (is.list(n) && all(vapply_1b(n, is.numeric)))))
       stopf("n must be an integer vector or a list of integer vectors")
-    if (!is.list(n))
-      n = list(n)
     if (length(unique(lengths(n))) != 1L)
       stopf("adaptive window provided in 'n' must not to have different lengths")
-    if (length(n[[1L]]) != len)
+    if (is.numeric(n) && length(n) != len)
+      stopf("length of integer vector(s) provided as list to 'n' argument must be equal to number of observations provided in 'x'")
+    if (is.list(n) && length(n[[1L]]) != len)
       stopf("length of vectors in 'x' must match to length of adaptive window in 'n'")
     if (verbose)
       catf("partial2adaptive: froll adaptive=TRUE and partial=TRUE trimming 'n'\n")