From d7162e4fda8d544cb5208dd9920a5a40bbefd75c Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 29 Aug 2018 18:03:50 +0200
Subject: [PATCH] v1.0.13.7 remove tests on Ind_zeroes in ErrorCrit* functions
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/ErrorCrit_KGE.R | 8 +++-----
R/ErrorCrit_KGE2.R | 8 +++-----
R/ErrorCrit_NSE.R | 8 +++-----
R/ErrorCrit_RMSE.R | 8 +++-----
6 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 903d219f..4a96bb05 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.0.13.6
+Version: 1.0.13.7
Date: 2018-08-29
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 1d3acea6..617d0fe4 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.0.13.6 Release Notes (2018-08-29)
+### 1.0.13.7 Release Notes (2018-08-29)
#### Deprectated and defunct
diff --git a/R/ErrorCrit_KGE.R b/R/ErrorCrit_KGE.R
index fa82de17..048b529c 100644
--- a/R/ErrorCrit_KGE.R
+++ b/R/ErrorCrit_KGE.R
@@ -42,11 +42,9 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation
- if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) {
- if (length(InputsCrit$Ind_zeroes) > 0) {
- VarObs <- VarObs + InputsCrit$epsilon
- VarSim <- VarSim + InputsCrit$epsilon
- }
+ if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
+ VarObs <- VarObs + InputsCrit$epsilon
+ VarSim <- VarSim + InputsCrit$epsilon
}
if (InputsCrit$transfo == "sqrt") {
VarObs <- sqrt(VarObs)
diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R
index 88b1d6b8..ebc4a942 100644
--- a/R/ErrorCrit_KGE2.R
+++ b/R/ErrorCrit_KGE2.R
@@ -42,11 +42,9 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation
- if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) {
- if (length(InputsCrit$Ind_zeroes) > 0) {
- VarObs <- VarObs + InputsCrit$epsilon
- VarSim <- VarSim + InputsCrit$epsilon
- }
+ if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
+ VarObs <- VarObs + InputsCrit$epsilon
+ VarSim <- VarSim + InputsCrit$epsilon
}
if (InputsCrit$transfo == "sqrt") {
VarObs <- sqrt(VarObs)
diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R
index b65f7224..9fe2658b 100644
--- a/R/ErrorCrit_NSE.R
+++ b/R/ErrorCrit_NSE.R
@@ -42,11 +42,9 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation
- if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) {
- if (length(InputsCrit$Ind_zeroes) > 0) {
- VarObs <- VarObs + InputsCrit$epsilon
- VarSim <- VarSim + InputsCrit$epsilon
- }
+ if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
+ VarObs <- VarObs + InputsCrit$epsilon
+ VarSim <- VarSim + InputsCrit$epsilon
}
if (InputsCrit$transfo == "sqrt") {
VarObs <- sqrt(VarObs)
diff --git a/R/ErrorCrit_RMSE.R b/R/ErrorCrit_RMSE.R
index 085871cc..aed56617 100644
--- a/R/ErrorCrit_RMSE.R
+++ b/R/ErrorCrit_RMSE.R
@@ -42,11 +42,9 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation
- if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) {
- if (length(InputsCrit$Ind_zeroes) > 0) {
- VarObs <- VarObs + InputsCrit$epsilon
- VarSim <- VarSim + InputsCrit$epsilon
- }
+ if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
+ VarObs <- VarObs + InputsCrit$epsilon
+ VarSim <- VarSim + InputsCrit$epsilon
}
if (InputsCrit$transfo == "sqrt") {
VarObs <- sqrt(VarObs)
--
GitLab