From c0ba154aad6a889fa87e8aeac03690b56098feaf Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Thu, 30 Apr 2020 20:34:43 +0200
Subject: [PATCH] v1.4.7.0 feat: new SeriesAggreg2.OutputsModel function #41
---
DESCRIPTION | 2 +-
NAMESPACE | 3 ++-
NEWS.md | 3 ++-
R/SeriesAggreg2.OutputsModel.R | 24 ++++++++++++++++++++++++
4 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 R/SeriesAggreg2.OutputsModel.R
diff --git a/DESCRIPTION b/DESCRIPTION
index 72c0b398..5639505f 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.6.0
+Version: 1.4.7.0
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 679085a8..7e422d56 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -12,6 +12,7 @@ S3method("plot", "OutputsModel")
S3method("SeriesAggreg2", "data.frame")
S3method("SeriesAggreg2", "default")
S3method("SeriesAggreg2", "InputsModel")
+S3method("SeriesAggreg2", "OutputsModel")
@@ -53,7 +54,7 @@ export(SeriesAggreg)
export(SeriesAggreg2)
#export(SeriesAggreg2.data.frame)
export(SeriesAggreg2.InputsModel)
-#export(SeriesAggreg2.OutputsModel)
+export(SeriesAggreg2.OutputsModel)
export(TransfoParam)
export(TransfoParam_CemaNeige)
export(TransfoParam_CemaNeigeHyst)
diff --git a/NEWS.md b/NEWS.md
index 3b37e996..648b0ee0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,13 +4,14 @@
-### 1.4.6.0 Release Notes (2020-04-30)
+### 1.4.7.0 Release Notes (2020-04-30)
#### New features
- Added <code>SeriesAggreg2</code> method.
- Added <code>SeriesAggreg2.default()</code> function.
- Added <code>SeriesAggreg2.InputsModel()</code> function.
+- Added <code>SeriesAggreg2.OutputsModel()</code> function.
- Added <code>SeriesAggreg2.data.frame()</code> function. This new verson of the <code>SeriesAggreg()</code> function allows to compute regimes.
diff --git a/R/SeriesAggreg2.OutputsModel.R b/R/SeriesAggreg2.OutputsModel.R
new file mode 100644
index 00000000..6c086f4d
--- /dev/null
+++ b/R/SeriesAggreg2.OutputsModel.R
@@ -0,0 +1,24 @@
+SeriesAggreg2.OutputsModel <- function(TabSeries,
+ Format,
+ TimeFormat,
+ NewTimeFormat,
+ YearFirstMonth = 1, TimeLag = 0,
+ verbose = TRUE, ..., simplify = FALSE) {
+
+ if (!inherits(TabSeries, "OutputsModel")) {
+ stop("to be used with 'OutputsModel' object")
+ }
+
+ res <- SeriesAggreg2.default(TabSeries = TabSeries,
+ Format = Format,
+ TimeFormat = TimeFormat,
+ NewTimeFormat = NewTimeFormat,
+ YearFirstMonth = YearFirstMonth, TimeLag = TimeLag,
+ verbose = verbose,
+ simplify = simplify)
+
+ res$StateEnd <- TabSeries$StateEnd
+
+ return(res)
+
+}
\ No newline at end of file
--
GitLab