Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
HYCAR-Hydro
airGR
Commits
95b30045
Commit
95b30045
authored
Jan 05, 2021
by
Dorchies David
Browse files
v1.6.8.33 feat(SeriesAggreg): remove ConvertFun default value
Refs
#41
parent
3e49873d
Pipeline
#18820
passed with stages
in 12 minutes and 32 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
95b30045
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.6.8.3
2
Date: 202
0-12-23
Version: 1.6.8.3
3
Date: 202
1-01-05
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
...
...
NAMESPACE
View file @
95b30045
...
...
@@ -63,9 +63,6 @@ export(TransfoParam_GR5J)
export(TransfoParam_GR6J)
export(TransfoParam_Lag)
export(.ErrorCrit)
export(.AggregConvertFunTable)
#####################################
...
...
NEWS.md
View file @
95b30045
...
...
@@ -2,7 +2,7 @@
### 1.6.8.3
2
Release Notes (202
0-12-23
)
### 1.6.8.3
3
Release Notes (202
1-01-05
)
#### New features
...
...
R/SeriesAggreg.data.frame.R
View file @
95b30045
SeriesAggreg.data.frame
<-
function
(
x
,
Format
,
ConvertFun
=
getAggregConvertFun
(
names
(
x
)[
-1
])
,
ConvertFun
,
TimeFormat
=
NULL
,
NewTimeFormat
=
NULL
,
YearFirstMonth
=
1
,
...
...
man/SeriesAggreg.Rd
View file @
95b30045
...
...
@@ -24,16 +24,11 @@ Warning: on the aggregated outputs, the dates correspond to the beginning of the
\code{\link{SeriesAggreg.InputsModel}} and \code{\link{SeriesAggreg.OutputsModel}}
call \code{\link{SeriesAggreg.list}} which itself calls \code{\link{SeriesAggreg.data.frame}}.
So, all arguments passed to any \code{\link{SeriesAggreg}} method will be passed to \code{\link{SeriesAggreg.data.frame}}.
If \code{ConvertFun} is not provided, the operation to perform is guessed from the name of the list items or column
name dataframe in respect with the matching table \code{.AggregConvertFunTable}.
}
\usage{
\method{SeriesAggreg}{data.frame}(x,
Format,
ConvertFun
= getAggregConvertFun(names(x)[-1])
,
ConvertFun,
TimeFormat = NULL,
NewTimeFormat = NULL,
YearFirstMonth = 1,
...
...
tests/testthat/test-SeriesAggreg.R
View file @
95b30045
...
...
@@ -66,7 +66,8 @@ test_that("Check SeriesAggreg output values on yearly aggregation", {
c
(
"P"
,
"E"
,
"Qmm"
)],
2
,
sum
)
TestedValues
<-
unlist
(
SeriesAggreg
(
TabSeries
,
Format
=
"%Y"
,
YearFirstMonth
=
9
)[
1
,
c
(
"P"
,
"E"
,
"Qmm"
)])
YearFirstMonth
=
9
,
ConvertFun
=
rep
(
"sum"
,
3
))[
1
,
c
(
"P"
,
"E"
,
"Qmm"
)])
expect_equal
(
GoodValues
,
TestedValues
)
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment