v1.2.9.34 CLEAN: argument names added when FUN_CRIT is called in ErrorCrit

90b8fbad · Delaigue Olivier · 89caf8af · 90b8fbad · 90b8fbad · 90b8fbad
Commit 90b8fbad authored 5 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

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




--- a/R/ErrorCrit.R
+++ b/R/ErrorCrit.R
@@ -19,8 +19,8 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo
  
  ## ----- Single criterion
  if (inherits(InputsCrit, "Single")) {
-    OutputsCrit <- InputsCrit$FUN_CRIT(InputsCrit,
-                                       OutputsModel,
+    OutputsCrit <- InputsCrit$FUN_CRIT(InputsCrit = InputsCrit,
+                                       OutputsModel = OutputsModel,
                                       warnings = warnings,
                                       verbose = verbose)
  }
@@ -30,7 +30,10 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo
  
  if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) {
    listOutputsCrit <- lapply(InputsCrit, FUN = function(iInputsCrit) {
-      iInputsCrit$FUN_CRIT(iInputsCrit, OutputsModel, warnings = warnings, verbose = verbose)
+      iInputsCrit$FUN_CRIT(InputsCrit = iInputsCrit,
+                           OutputsModel = OutputsModel,
+                           warnings = warnings,
+                           verbose = verbose)
    })
    
    listValCrit  <- sapply(listOutputsCrit, function(x) x[["CritValue"]])