v1.2.9.5 BUG: check if FUN_TRANSFO = NULL in Calibration

d2109cc3 · Delaigue Olivier · 706d3ff4 · d2109cc3 · d2109cc3 · d2109cc3
Commit d2109cc3 authored 6 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 3 deletions
+5 -3
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.9.4
+Version: 1.2.9.5
 Date: 2019-03-13
 Authors@R: c(
  person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.9.4 Release Notes (2019-03-13) 
+### 1.2.9.5 Release Notes (2019-03-13) 

--- a/R/Calibration.R
+++ b/R/Calibration.R
@@ -4,7 +4,9 @@ Calibration <- function(InputsModel, RunOptions, InputsCrit, CalibOptions,
  FUN_MOD   <- match.fun(FUN_MOD)
  FUN_CRIT  <- match.fun(FUN_CRIT)
  FUN_CALIB <- match.fun(FUN_CALIB)
-  FUN_TRANSFO <- match.fun(FUN_TRANSFO)
+  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))
 }