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
d720bdcc
Commit
d720bdcc
authored
Mar 20, 2019
by
Delaigue Olivier
Browse files
v1.2.9.31 CLEAN: FUN_CALIB does not used anymore the FUN_CRIT arguments in Calibration fun
parent
f715a150
Changes
3
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
d720bdcc
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.9.3
0
Version: 1.2.9.3
1
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 @
d720bdcc
...
...
@@ -13,7 +13,7 @@ output:
### 1.2.9.3
0
Release Notes (2019-03-20)
### 1.2.9.3
1
Release Notes (2019-03-20)
...
...
R/Calibration.R
View file @
d720bdcc
Calibration
<-
function
(
InputsModel
,
RunOptions
,
InputsCrit
,
CalibOptions
,
FUN_MOD
,
FUN_CRIT
,
FUN_CALIB
=
Calibration_Michel
,
FUN_TRANSFO
=
NULL
,
Calibration
<-
function
(
InputsModel
,
RunOptions
,
InputsCrit
,
CalibOptions
,
FUN_MOD
,
FUN_CRIT
,
# deprecated
FUN_CALIB
=
Calibration_Michel
,
FUN_TRANSFO
=
NULL
,
verbose
=
TRUE
)
{
FUN_MOD
<-
match.fun
(
FUN_MOD
)
FUN_CRIT
<-
match.fun
(
FUN_CRIT
)
...
...
@@ -7,6 +13,6 @@ Calibration <- function(InputsModel, RunOptions, InputsCrit, CalibOptions,
if
(
!
is.null
(
FUN_TRANSFO
))
{
FUN_TRANSFO
<-
match.fun
(
FUN_TRANSFO
)
}
return
(
FUN_CALIB
(
InputsModel
,
RunOptions
,
InputsCrit
,
CalibOptions
,
FUN_MOD
,
FUN_CRIT
,
FUN_TRANSFO
,
verbose
=
verbose
))
return
(
FUN_CALIB
(
InputsModel
,
RunOptions
,
InputsCrit
,
CalibOptions
,
FUN_MOD
,
FUN_TRANSFO
,
verbose
=
verbose
))
}
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