From 91421a809cbc9e7857a6c1bebca85d9cf9be70b1 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Thu, 21 Feb 2019 14:10:53 +0100
Subject: [PATCH] v1.1.3.2 UPDATE: ErrorCrit_NSE takes into account SCA, SWE
and SD observations
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/ErrorCrit_NSE.R | 14 ++++++++------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index f43a8987..f0d016da 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.1
+Version: 1.1.3.2
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 a9a78743..7ee4d218 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.1.3.1 Release Notes (2019-02-21)
+### 1.1.3.2 Release Notes (2019-02-21)
diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R
index 881da724..5726af94 100644
--- a/R/ErrorCrit_NSE.R
+++ b/R/ErrorCrit_NSE.R
@@ -7,7 +7,7 @@ ErrorCrit_NSE <- 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'")
return(NULL)
}
if (!inherits(OutputsModel, "OutputsModel")) {
@@ -18,21 +18,23 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
##Initialisation_________________________________
CritName <- NA
+ CritVar <- InputsCrit$varObs
if (InputsCrit$transfo == "") {
- CritName <- "NSE[Q]"
+ CritName <- "NSE[CritVar]"
}
if (InputsCrit$transfo == "sqrt") {
- CritName <- "NSE[sqrt(Q)]"
+ CritName <- "NSE[sqrt(CritVar)]"
}
if (InputsCrit$transfo == "log") {
- CritName <- "NSE[log(Q)]"
+ CritName <- "NSE[log(CritVar)]"
}
if (InputsCrit$transfo == "inv") {
- CritName <- "NSE[1/Q]"
+ CritName <- "NSE[1/CritVar]"
}
if (InputsCrit$transfo == "sort") {
- CritName <- "NSE[sort(Q)]"
+ CritName <- "NSE[sort(CritVar)]"
}
+ CritName <- gsub(pattern = "CritVar", replacement = CritVar, x = CritName)
CritValue <- NA
CritBestValue <- +1
Multiplier <- -1
--
GitLab