v1.2.9.6 BUG: match.fun now works on FUN_CRIT in CreateInputsCrit if it is a list

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

Showing

with 7 additions and 3 deletions
+7 -3
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.9.5
+Version: 1.2.9.6
 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.5 Release Notes (2019-03-13) 
+### 1.2.9.6 Release Notes (2019-03-13) 




--- a/R/CreateInputsCrit.R
+++ b/R/CreateInputsCrit.R
@@ -15,7 +15,6 @@ CreateInputsCrit <- function(FUN_CRIT,
  
  ObjectClass <- NULL
  
-  FUN_CRIT <- match.fun(FUN_CRIT)
  
  ## ---------- check arguments
  
@@ -91,6 +90,10 @@ CreateInputsCrit <- function(FUN_CRIT,
    }
  }
  
+  ## check 'FUN_CRIT'
+  listArgs$FUN_CRIT <- lapply(listArgs$FUN_CRIT, FUN = match.fun)
+  
+  
  ## check 'varObs'
  if (missing(varObs)) {
    listArgs$varObs <- as.list(rep("Q", times = length(listArgs$obs)))
@@ -99,6 +102,7 @@ CreateInputsCrit <- function(FUN_CRIT,
    # }
  }
  
+  
  ## check 'varObs' + 'RunOptions'
  if ("Q" %in% varObs & !inherits(RunOptions, "GR")) {
    stop("'varObs' cannot contain Q if a GR rainfall-runoff model is not used")