diff --git a/DESCRIPTION b/DESCRIPTION index cab58d0c61c3b70a7972b23820a5d2c82c887860..241c9971f94bb33c80d0338acd9c26121104eddc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.4.3.78 +Version: 1.4.3.79 Date: 2020-04-06 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.md b/NEWS.md index 7a5b23da3843ec57e702b7bbdc3eb26d84f80948..703b55bf0fcc3e3e0ff93fd5ad8697a5ae68db37 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.4.3.78 Release Notes (2020-04-06) +### 1.4.3.79 Release Notes (2020-04-06) #### CRAN-compatibility updates diff --git a/R/SeriesAggreg.R b/R/SeriesAggreg.R index e973aa2bed15a4ed2639486a16e168bc23a898a9..763e422174a606f120dbfe622405c7e5e6e1e810 100644 --- a/R/SeriesAggreg.R +++ b/R/SeriesAggreg.R @@ -69,18 +69,11 @@ SeriesAggreg <- function(TabSeries, stop("'YearFirstMonth' must be only one integer between 1 and 12") } ##check_DatesR_integrity - if (TimeFormat == "hourly") { - by <- "hours" - } - if (TimeFormat == "daily") { - by <- "days" - } - if (TimeFormat == "monthly") { - by <- "months" - } - if (TimeFormat == "yearly") { - by <- "years" - } + by <- switch(TimeFormat, + 'hourly' = "hours", + 'daily' = "days", + 'monthly' = "months", + 'yearly' = "years") TmpDatesR <- seq(from = TabSeries[1, 1], to = tail(TabSeries[, 1], 1), by = by) if (!identical(TabSeries[, 1], TmpDatesR)) { stop("some dates might not be ordered or are missing in 'TabSeries'")