From 01696b82fbb68995c6517627b53c3bff312aa602 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 25 Mar 2019 09:44:28 +0100
Subject: [PATCH] v1.2.11.6 CLEAN: minor syntax revision of Calibration
---
DESCRIPTION | 4 ++--
NEWS.rmd | 2 +-
R/Calibration.R | 6 +++++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index b59ef6b4..c2d5ea56 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.11.5
-Date: 2019-03-22
+Version: 1.2.11.6
+Date: 2019-03-23
Authors@R: c(
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")),
diff --git a/NEWS.rmd b/NEWS.rmd
index e1d39fa3..d3aaf737 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.11.5 Release Notes (2019-03-22)
+### 1.2.11.6 Release Notes (2019-03-23)
diff --git a/R/Calibration.R b/R/Calibration.R
index c6088ad3..2bfceaf4 100644
--- a/R/Calibration.R
+++ b/R/Calibration.R
@@ -7,6 +7,7 @@ Calibration <- function(InputsModel,
FUN_CALIB = Calibration_Michel,
FUN_TRANSFO = NULL,
verbose = TRUE) {
+
FUN_MOD <- match.fun(FUN_MOD)
if (!missing(FUN_CRIT)) {
FUN_CRIT <- match.fun(FUN_CRIT)
@@ -15,7 +16,10 @@ Calibration <- function(InputsModel,
if (!is.null(FUN_TRANSFO)) {
FUN_TRANSFO <- match.fun(FUN_TRANSFO)
}
+
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))
}
--
GitLab