error message update

Author: jangorecki

inst/tests/froll.Rraw

@@ -371,9 +371,9 @@ test(6000.086, frollmean(list(1:3, 2:4), integer()), error="n must be non 0 leng
 #### n==0 (k==0, k[i]==0)
 ##moved to 6001.
 #### n<0
-test(6000.089, frollmean(1:3, -2), error="n must be positive integer values")
+test(6000.089, frollmean(1:3, -2), error="n must be non-negative integer values")
 #### n[[1L]]>0 && n[[2L]]<0
-test(6000.090, frollmean(1:3, c(2, -2)), error="n must be positive integer values")
+test(6000.090, frollmean(1:3, c(2, -2)), error="n must be non-negative integer values")
 #### n[[1L]]==n[[2L]]
 test(6000.091, frollmean(1:3, c(2, 2)), list(c(NA_real_, 1.5, 2.5), c(NA_real_, 1.5, 2.5)))
 test(6000.092, frollmean(list(1:3, 4:6), c(2, 2)), list(c(NA_real_, 1.5, 2.5), c(NA_real_, 1.5, 2.5), c(NA_real_, 4.5, 5.5), c(NA_real_, 4.5, 5.5)))
@@ -410,9 +410,9 @@ test(6000.111, frollmean(list(1, 10, 5), 2, align="left"), list(NA_real_, NA_rea
 test(6000.112, frollmean(5, 2, align="center"), NA_real_)
 test(6000.113, frollmean(list(1, 10, 5), 2, align="center"), list(NA_real_, NA_real_, NA_real_))
 #### n==Inf
-test(6000.114, frollmean(1:5, Inf), error="n must be positive integer values", warning="NAs introduced by coercion*")
+test(6000.114, frollmean(1:5, Inf), error="n must be non-negative integer values", warning="NAs introduced by coercion*")
 #### n==c(5, Inf)
-test(6000.115, frollmean(1:5, c(5, Inf)), error="n must be positive integer values", warning="NAs introduced by coercion*")
+test(6000.115, frollmean(1:5, c(5, Inf)), error="n must be non-negative integer values", warning="NAs introduced by coercion*")
 #### is.complex(n)
 test(6000.116, frollmean(1:5, 3i), error="n must be integer")
 #### is.character(n)

src/frollR.c

@@ -41,7 +41,7 @@ SEXP coerceK(SEXP obj, bool adaptive) {
     int *iik = INTEGER(ans);
     while (i < nk && iik[i] >= 0) i++;
     if (i != nk)
-      error(_("n must be positive integer values (>= 0)"));
+      error(_("n must be non-negative integer values (>= 0)"));
   } else {
     if (isVectorAtomic(obj)) {
       ans = PROTECT(allocVector(VECSXP, 1)); protecti++;
@@ -71,7 +71,7 @@ SEXP coerceK(SEXP obj, bool adaptive) {
       R_len_t ii = 0;
       while (ii < nx && iik[ii] >= 0) ii++;
       if (ii != nx)
-        error(_("n must be positive integer values (>= 0)"));
+        error(_("n must be non-negative integer values (>= 0)"));
     }
   }
   UNPROTECT(protecti);