From 6da405c2d7f382af1aa94d16c20e818d9bbd779f Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 20 Apr 2020 22:38:52 +0200
Subject: [PATCH] v1.4.4.22 CLEAN: minor text revision of error message in
SeriesAggreg #41
---
DESCRIPTION | 2 +-
NAMESPACE | 8 ++++++++
R/SeriesAggreg2.R | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 3394a241..a4634f7f 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.4.21
+Version: 1.4.4.22
Date: 2020-04-20
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NAMESPACE b/NAMESPACE
index ca421516..65d8f01c 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -9,6 +9,10 @@ useDynLib(airGR, .registration = TRUE)
## S3 methods ##
#####################################
S3method("plot", "OutputsModel")
+S3method("SeriesAggreg2", "InputsModel")
+S3method("SeriesAggreg2", "OutputsModel")
+S3method("SeriesAggreg2", "default")
+
@@ -62,6 +66,10 @@ export(TransfoParam_Lag)
export(plot.OutputsModel)
exportPattern(".FortranOutputs")
exportPattern(".ErrorCrit")
+exportMethods(SeriesAggreg2.InputsModel)
+exportMethods(SeriesAggreg2.OutputsModel)
+exportMethods(SeriesAggreg2.default)
+
diff --git a/R/SeriesAggreg2.R b/R/SeriesAggreg2.R
index d3745c7a..52412a2d 100644
--- a/R/SeriesAggreg2.R
+++ b/R/SeriesAggreg2.R
@@ -38,7 +38,7 @@ SeriesAggreg2 <- function(TabSeries, Format, TimeFormat, NewTimeFormat, ConvertF
## check TabSeries other columns (boolean converted to numeric)
apply(TabSeries[, -1L], MARGIN = 2, FUN = function(iCol) {
if (!is.numeric(iCol)) {
- stop("'TabSeries' columns (other than the first one) be of numeric class")
+ stop("'TabSeries' columns (other than the first one) must be of numeric class")
}
})
## check Format
--
GitLab