diff --git a/DESCRIPTION b/DESCRIPTION index 5486f42c3d313ff663aa0aeb21d549c19f981cc8..baffe254f5b55312e4f82dc3946b3c607bf50acd 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 97d7793f352bb713350c05d7cf4457cb224ab978..745c4db8708fa623943dd332a733461b18d19327 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 33a677327c3b33f199aaf8dd66f48ae649a9fc14..59b12c2a61d75c9b3aa73f940ffbe7da1655912e 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 4da98e9b21f3e7eca3835cafc6a3a39fbc5b92dd..80ea4610e0f5daf19143c1bb0a9354187e08a4e8 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)) {