From 7538d88e00cc97b0a0e19e175490193311caf9d1 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Thu, 30 Apr 2020 17:49:49 +0200
Subject: [PATCH] v1.4.4.27 feat: new SeriesAggreg 2 method; SeriesAggreg
function renamed to SeriesAggreg.data.frame #41 by consequences, the order of
the argument of SeriesAggreg.data.frame changed
---
DESCRIPTION | 2 +-
NAMESPACE | 5 ++++-
NEWS.md | 3 ++-
R/SeriesAggreg2.R | 13 +++++++++++--
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 5486f42c..baffe254 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.26
+Version: 1.4.4.27
Date: 2020-04-30
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NAMESPACE b/NAMESPACE
index 97d7793f..745c4db8 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -9,7 +9,7 @@ useDynLib(airGR, .registration = TRUE)
## S3 methods ##
#####################################
S3method("plot", "OutputsModel")
-
+S3method("SeriesAggreg2", "data.frame")
@@ -49,6 +49,9 @@ export(RunModel_GR6J)
export(RunModel_Lag)
export(SeriesAggreg)
export(SeriesAggreg2)
+#export(SeriesAggreg2.data.frame)
+#export(SeriesAggreg2.InputsModel)
+#export(SeriesAggreg2.OutputsModel)
export(TransfoParam)
export(TransfoParam_CemaNeige)
export(TransfoParam_CemaNeigeHyst)
diff --git a/NEWS.md b/NEWS.md
index 33a67732..59b12c2a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,10 +4,11 @@
-### 1.4.4.26 Release Notes (2020-04-30)
+### 1.4.4.27 Release Notes (2020-04-30)
#### New features
+- Added <code>SeriesAggreg2()</code> method.
- Added <code>SeriesAggreg2()</code> function. This new verson of the <code>SeriesAggreg()</code> function allows to compute regimes.
diff --git a/R/SeriesAggreg2.R b/R/SeriesAggreg2.R
index 4da98e9b..80ea4610 100644
--- a/R/SeriesAggreg2.R
+++ b/R/SeriesAggreg2.R
@@ -1,5 +1,14 @@
-SeriesAggreg2 <- function(TabSeries, Format, TimeFormat, NewTimeFormat, ConvertFun,
- YearFirstMonth = 1, TimeLag = 0, verbose = TRUE) {
+SeriesAggreg2 <- function(TabSeries,
+ Format, TimeFormat, NewTimeFormat,
+ YearFirstMonth = 1, TimeLag = 0,
+ verbose = TRUE,
+ ...) {
+ UseMethod("SeriesAggreg2")
+}
+
+
+SeriesAggreg2.data.frame <- function(TabSeries, Format, TimeFormat, NewTimeFormat,
+ YearFirstMonth = 1, TimeLag = 0, verbose = TRUE, ..., ConvertFun) {
## Arguments checks
if (!missing(TimeFormat)) {
--
GitLab