anlz_fibmatrix returns warning if some insufficient stations, error i…

…f no sufficient stations

R/anlz_fibmatrix.R

@@ -123,15 +123,21 @@ anlz_fibmatrix <- function(fibdata,
   if(any(!chk))
     stop('Station(s) not found in fibdata: ', paste(stas[!chk], collapse = ', '))
 
-  # check stations include enough years
   chk <- !stas %in% stasval
-  if(any(chk))
-    stop('Stations with insufficient data for lagyr: ', paste(stas[chk], collapse = ', '))
+
+  # check if some stations valid for lagyr
+  if(sum(chk) > 0 & sum(chk) < length(chk))
+    warning('Stations with insufficient data for lagyr: ', paste(stas[chk], collapse = ', '))
+
+  # check if all stations invalid for lagyr
+  if(sum(chk) == length(chk)){
+    stop('No stations with sufficient data for lagyr')
+  }
 
   # get geomean, proportion of sites > 400 cfu / 100mL, and prob of exceedence
   # handles lagged calculations
   dat <- fibdata %>%
-    dplyr::filter(station %in% stas) %>%
+    dplyr::filter(station %in% stasval) %>%
     dplyr::filter(yr >= (yrrng[1] - (lagyr - 1)) & yr <= yrrng[2]) %>%
     dplyr::filter(!is.na(indic) | indic < 0) %>%
     summarise(

tests/testthat/test-anlz_fibmatrix.R

@@ -8,11 +8,16 @@ test_that("Checking anlz_fibmatrix station error", {
                fixed = T)
 })
 
-test_that("Checking anlz_fibmatrix station error insufficient data", {
-  expect_error(anlz_fibmatrix(fibdata, indic = 'fcolif', stas = '616'), regexp = 'Stations with insufficient data for lagyr: 616',
+test_that("Checking anlz_fibmatrix station warning some insufficient data", {
+  expect_warning(anlz_fibmatrix(fibdata, indic = 'fcolif', stas = c('115', '616')), regexp = 'Stations with insufficient data for lagyr: 616',
                fixed = T)
 })
 
+test_that("Checking anlz_fibmatrix station error all insufficient data", {
+  expect_warning(anlz_fibmatrix(fibdata, indic = 'fcolif', stas = '616'), regexp = 'No stations with sufficient data for lagyr',
+                 fixed = T)
+})
+
 # Example data
 fibdata <- data.frame(
   yr = rep(2000:2005, each = 3),