v1.4.4.15 CLEAN: ConvertFun checked simplified in SeriesAggreg2

DESCRIPTION

 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.4.4.14
+Version: 1.4.4.15
 Date: 2020-04-09
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

NEWS.md

@@ -4,7 +4,7 @@
 
 
 
-### 1.4.4.14 Release Notes (2020-04-09)
+### 1.4.4.15 Release Notes (2020-04-09)
 
 #### New features
 

R/SeriesAggreg2.R

@@ -28,20 +28,16 @@ SeriesAggreg2 <- function(TabSeries, Format, ConvertFun,
   Format <- gsub(pattern = "[[:punct:]]+", replacement = "%", Format)
   Format <- match.arg(Format, choices = listFormat)
   ## check ConvertFun
-  if (!is.vector(ConvertFun)) {
-    stop("'ConvertFun' must be a vector of character")
-  }
-  if (!is.character(ConvertFun)) {
-    stop("'ConvertFun' must be a vector of character")
+  listConvertFun <- c("sum", "mean")
+  ConvertFun <- listConvertFun[match(ConvertFun, listConvertFun)]
+  if (anyNA(ConvertFun)) {
+    stop("'ConvertFun' should be a one of 'sum' or 'mean'")
   }
   if (length(ConvertFun) != (ncol(TabSeries) - 1)) {
     stop(
       sprintf("'ConvertFun' must be of length %i (ncol(TabSeries)-1)", ncol(TabSeries) - 1)
     )
   }
-  if (!all(ConvertFun %in% c("sum", "mean"))) {
-    stop("'ConvertFun' should be one of 'sum' or 'mean'")
-  }
   ## check YearFirstMonth
   msgYearFirstMonth <- "'YearFirstMonth' should be a numeric value between 1 and 12"
   YearFirstMonth <- match(YearFirstMonth, 1:12)