diff --git a/DESCRIPTION b/DESCRIPTION index 9211bda6e2e05103056c233d7b723216b9fe529f..da2fd85e89aa4fdfd00e2c79a92d65e571725124 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.3 +Version: 1.1.3.4 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 697ac23d43cb91c1fc56a133d799eb50e79c6188..45ae42e6264984ed275515e6f42a3ff7eb92b557 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.1.3.3 Release Notes (2019-02-21) +### 1.1.3.4 Release Notes (2019-02-21) diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R index 97e087980ca37e28532f718d1d6eec86230ad1dc..96237ea2cb4f489d9b932999b06da8c7c4361fba 100644 --- a/R/ErrorCrit_KGE2.R +++ b/R/ErrorCrit_KGE2.R @@ -7,7 +7,7 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = 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_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ##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