From d720bdcca9fa5855e1a244c32779c45dee6dbfae Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 20 Mar 2019 08:31:56 +0100
Subject: [PATCH] v1.2.9.31 CLEAN: FUN_CALIB does not used anymore the FUN_CRIT
arguments in Calibration fun
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/Calibration.R | 12 +++++++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index fb0d44de..705ecb74 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.9.30
+Version: 1.2.9.31
Date: 2019-03-20
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.rmd b/NEWS.rmd
index d4d6e2c6..c15f129a 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.9.30 Release Notes (2019-03-20)
+### 1.2.9.31 Release Notes (2019-03-20)
diff --git a/R/Calibration.R b/R/Calibration.R
index adc66d8e..a65d78c4 100644
--- a/R/Calibration.R
+++ b/R/Calibration.R
@@ -1,5 +1,11 @@
-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))
}
--
GitLab