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
9c462193
Commit
9c462193
authored
Mar 20, 2019
by
Delaigue Olivier
Browse files
v1.2.9.32 BUG: check FUN_CRIT in Calibration* funs and fixed return in Calibration fun
parent
d720bdcc
Changes
4
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
9c462193
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.9.3
1
Version: 1.2.9.3
2
Date: 2019-03-20
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.rmd
View file @
9c462193
...
...
@@ -13,7 +13,7 @@ output:
### 1.2.9.3
1
Release Notes (2019-03-20)
### 1.2.9.3
2
Release Notes (2019-03-20)
...
...
R/Calibration.R
View file @
9c462193
...
...
@@ -8,11 +8,14 @@ Calibration <- function(InputsModel,
FUN_TRANSFO
=
NULL
,
verbose
=
TRUE
)
{
FUN_MOD
<-
match.fun
(
FUN_MOD
)
FUN_CRIT
<-
match.fun
(
FUN_CRIT
)
if
(
!
missing
(
FUN_CRIT
))
{
FUN_CRIT
<-
match.fun
(
FUN_CRIT
)
}
FUN_CALIB
<-
match.fun
(
FUN_CALIB
)
if
(
!
is.null
(
FUN_TRANSFO
))
{
FUN_TRANSFO
<-
match.fun
(
FUN_TRANSFO
)
}
return
(
FUN_CALIB
(
InputsModel
,
RunOptions
,
InputsCrit
,
CalibOptions
,
FUN_MOD
,
FUN_TRANSFO
,
verbose
=
verbose
))
return
(
FUN_CALIB
(
InputsModel
=
InputsModel
,
RunOptions
=
RunOptions
,
InputsCrit
=
InputsCrit
,
CalibOptions
=
CalibOptions
,
FUN_MOD
=
FUN_MOD
,
FUN_TRANSFO
=
FUN_TRANSFO
,
verbose
=
verbose
))
}
R/Calibration_Michel.R
View file @
9c462193
...
...
@@ -9,7 +9,9 @@ Calibration_Michel <- function(InputsModel,
FUN_MOD
<-
match.fun
(
FUN_MOD
)
FUN_CRIT
<-
match.fun
(
FUN_CRIT
)
if
(
!
missing
(
FUN_CRIT
))
{
FUN_CRIT
<-
match.fun
(
FUN_CRIT
)
}
if
(
!
is.null
(
FUN_TRANSFO
))
{
FUN_TRANSFO
<-
match.fun
(
FUN_TRANSFO
)
}
...
...
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