diff --git a/DESCRIPTION b/DESCRIPTION index f0d016da93142cc0890162cfa0061ebcde10bfa5..9211bda6e2e05103056c233d7b723216b9fe529f 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.1.3.2 +Version: 1.1.3.3 Date: 2019-02-21 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 7ee4d2180f4fe0cedab605234d2202012a0528bd..697ac23d43cb91c1fc56a133d799eb50e79c6188 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.1.3.2 Release Notes (2019-02-21) +### 1.1.3.3 Release Notes (2019-02-21) diff --git a/R/ErrorCrit_KGE.R b/R/ErrorCrit_KGE.R index b55e77e17084b43a1d4b15ca5ab12ff64d5564ae..fccc6158471ed5ed4a11fb5a18c73afa51fbc4ca 100644 --- a/R/ErrorCrit_KGE.R +++ b/R/ErrorCrit_KGE.R @@ -7,7 +7,7 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T return(NULL) } if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) { - stop("InputsCrit must be of class 'Single' \n") + stop("InputsCrit must be of class 'Single'. Use the ErrorCrit function on objects of class 'Multi' or 'Compo' with KGE") return(NULL) } if (!inherits(OutputsModel, "OutputsModel")) { @@ -18,24 +18,26 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ##Initialisation_________________________________ CritName <- NA + CritVar <- InputsCrit$varObs if (InputsCrit$transfo == "") { - CritName <- "KGE[Q]" + CritName <- "KGE[CritVar]" } if (InputsCrit$transfo == "sqrt") { - CritName <- "KGE[sqrt(Q)]" + CritName <- "KGE[sqrt(CritVar)]" } if (InputsCrit$transfo == "log") { - CritName <- "KGE[log(Q)]" + CritName <- "KGE[log(CritVar)]" } if (InputsCrit$transfo == "inv") { - CritName <- "KGE[1/Q]" + CritName <- "KGE[1/CritVar]" } if (InputsCrit$transfo == "sort") { - CritName <- "KGE[sort(Q)]" + CritName <- "KGE[sort(CritVar)]" } - CritValue <- NA - CritBestValue <- +1 - Multiplier <- -1 + CritName <- gsub(pattern = "CritVar", replacement = CritVar, x = CritName) + CritValue <- NA + CritBestValue <- +1 + Multiplier <- -1 ### must be equal to -1 or +1 only