Commit 01696b82 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.2.11.6 CLEAN: minor syntax revision of Calibration

Showing with 8 additions and 4 deletions
+8 -4
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.11.5 Version: 1.2.11.6
Date: 2019-03-22 Date: 2019-03-23
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Charles", "Perrin", role = c("aut", "ths"), comment = c(ORCID = "0000-0001-8552-1881")), person("Charles", "Perrin", role = c("aut", "ths"), comment = c(ORCID = "0000-0001-8552-1881")),
......
...@@ -13,7 +13,7 @@ output: ...@@ -13,7 +13,7 @@ output:
### 1.2.11.5 Release Notes (2019-03-22) ### 1.2.11.6 Release Notes (2019-03-23)
......
...@@ -7,6 +7,7 @@ Calibration <- function(InputsModel, ...@@ -7,6 +7,7 @@ Calibration <- function(InputsModel,
FUN_CALIB = Calibration_Michel, FUN_CALIB = Calibration_Michel,
FUN_TRANSFO = NULL, FUN_TRANSFO = NULL,
verbose = TRUE) { verbose = TRUE) {
FUN_MOD <- match.fun(FUN_MOD) FUN_MOD <- match.fun(FUN_MOD)
if (!missing(FUN_CRIT)) { if (!missing(FUN_CRIT)) {
FUN_CRIT <- match.fun(FUN_CRIT) FUN_CRIT <- match.fun(FUN_CRIT)
...@@ -15,7 +16,10 @@ Calibration <- function(InputsModel, ...@@ -15,7 +16,10 @@ Calibration <- function(InputsModel,
if (!is.null(FUN_TRANSFO)) { if (!is.null(FUN_TRANSFO)) {
FUN_TRANSFO <- match.fun(FUN_TRANSFO) FUN_TRANSFO <- match.fun(FUN_TRANSFO)
} }
return(FUN_CALIB(InputsModel = InputsModel, RunOptions = RunOptions, InputsCrit = InputsCrit, return(FUN_CALIB(InputsModel = InputsModel, RunOptions = RunOptions, InputsCrit = InputsCrit,
CalibOptions = CalibOptions, FUN_MOD = FUN_MOD, FUN_TRANSFO = FUN_TRANSFO, verbose = verbose)) CalibOptions = CalibOptions,
FUN_MOD = FUN_MOD, FUN_TRANSFO = FUN_TRANSFO,
verbose = verbose))
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment