v1.4.7.0 feat: new SeriesAggreg2.OutputsModel function #41

DESCRIPTION

 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")),

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)

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.
 
 

R/SeriesAggreg2.OutputsModel.R

+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