From f25ee99c4681ec3f232887eecf49edb88564191c Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Wed, 8 Apr 2020 10:33:57 +0200
Subject: [PATCH] v1.4.3.81 CLEAN: useless argument checks removed from
SeriesAggreg
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/SeriesAggreg.R | 9 ---------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 6f4b0796..33ed2744 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.80
+Version: 1.4.3.81
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 efa57199..cd330297 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 1.4.3.80 Release Notes (2020-04-06)
+### 1.4.3.81 Release Notes (2020-04-06)
#### CRAN-compatibility updates
diff --git a/R/SeriesAggreg.R b/R/SeriesAggreg.R
index 8fa357d0..6d0565fc 100644
--- a/R/SeriesAggreg.R
+++ b/R/SeriesAggreg.R
@@ -8,9 +8,6 @@ SeriesAggreg <- function(TabSeries,
##_Arguments_check
##check_TabSeries
- if (is.null(TabSeries) ) {
- stop("'TabSeries' must be a data.frame containing the dates and data to be converted")
- }
if (!is.data.frame(TabSeries)) {
stop("'TabSeries' must be a data.frame containing the dates and data to be converted")
}
@@ -34,9 +31,6 @@ SeriesAggreg <- function(TabSeries,
TimeFormat <- match.arg(TimeFormat , choices = TimeStep)
NewTimeFormat <- match.arg(NewTimeFormat, choices = TimeStep)
##check_ConvertFun
- if (is.null(ConvertFun)) {
- stop("'ConvertFun' must be a vector of character")
- }
if (!is.vector(ConvertFun)) {
stop("'ConvertFun' must be a vector of character")
}
@@ -52,9 +46,6 @@ SeriesAggreg <- function(TabSeries,
stop("'ConvertFun' elements must be one of 'sum' or 'mean'")
}
##check_YearFirstMonth
- if (is.null(YearFirstMonth)) {
- stop("'YearFirstMonth' must be an integer between 1 and 12")
- }
if (!is.vector(YearFirstMonth)) {
stop("'YearFirstMonth' must be an integer between 1 and 12")
}
--
GitLab