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
90b8fbad
Commit
90b8fbad
authored
Mar 21, 2019
by
Delaigue Olivier
Browse files
v1.2.9.34 CLEAN: argument names added when FUN_CRIT is called in ErrorCrit
parent
89caf8af
Changes
3
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
90b8fbad
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.9.3
3
Version: 1.2.9.3
4
Date: 2019-03-21
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.rmd
View file @
90b8fbad
...
...
@@ -13,7 +13,7 @@ output:
### 1.2.9.3
3
Release Notes (2019-03-21)
### 1.2.9.3
4
Release Notes (2019-03-21)
...
...
R/ErrorCrit.R
View file @
90b8fbad
...
...
@@ -19,8 +19,8 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo
## ----- Single criterion
if
(
inherits
(
InputsCrit
,
"Single"
))
{
OutputsCrit
<-
InputsCrit
$
FUN_CRIT
(
InputsCrit
,
OutputsModel
,
OutputsCrit
<-
InputsCrit
$
FUN_CRIT
(
InputsCrit
=
InputsCrit
,
OutputsModel
=
OutputsModel
,
warnings
=
warnings
,
verbose
=
verbose
)
}
...
...
@@ -30,7 +30,10 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo
if
(
inherits
(
InputsCrit
,
"Multi"
)
|
inherits
(
InputsCrit
,
"Compo"
))
{
listOutputsCrit
<-
lapply
(
InputsCrit
,
FUN
=
function
(
iInputsCrit
)
{
iInputsCrit
$
FUN_CRIT
(
iInputsCrit
,
OutputsModel
,
warnings
=
warnings
,
verbose
=
verbose
)
iInputsCrit
$
FUN_CRIT
(
InputsCrit
=
iInputsCrit
,
OutputsModel
=
OutputsModel
,
warnings
=
warnings
,
verbose
=
verbose
)
})
listValCrit
<-
sapply
(
listOutputsCrit
,
function
(
x
)
x
[[
"CritValue"
]])
...
...
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