From 6a20b5542c6eb800c44ee33ec761d1a08cc5e254 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 22 Oct 2018 17:37:02 +0200
Subject: [PATCH] v1.1.2.3 UPDATE: ErrorCrit_KGE compatible with new InputsCrit
objects
---
DESCRIPTION | 2 +-
R/ErrorCrit_NSE.R | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 81f3d9a2..858d0eb3 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.2.2
+Version: 1.1.2.3
Date: 2018-10-22
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R
index d3adc5a3..6d694c5a 100644
--- a/R/ErrorCrit_NSE.R
+++ b/R/ErrorCrit_NSE.R
@@ -5,6 +5,10 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
if (!inherits(InputsCrit, "InputsCrit")) {
stop("InputsCrit must be of class 'InputsCrit' \n")
return(NULL)
+ }
+ if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) {
+ stop("InputsCrit must be of class 'Single' \n")
+ return(NULL)
}
if (!inherits(OutputsModel, "OutputsModel")) {
stop("OutputsModel must be of class 'OutputsModel' \n")
@@ -36,7 +40,7 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
##Data_preparation_______________________________
- VarObs <- InputsCrit$Qobs
+ VarObs <- InputsCrit$obs
VarObs[!InputsCrit$BoolCrit] <- NA
VarSim <- OutputsModel$Qsim
VarSim[!InputsCrit$BoolCrit] <- NA
@@ -124,7 +128,7 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
##Verbose______________________________________
if (verbose) {
- message("Crit. ", CritName, " = ", sprintf("%.4f", CritValue))
+ message("Crit. ", CritName, " = ", sprintf("%.4f", CritValue), "\n")
}
--
GitLab