From fca8f788dcd04f9ceb5c9ff9c9240eeb663b16bd Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Tue, 16 Oct 2018 08:54:28 +0200
Subject: [PATCH] v1.0.15.5 CLEAN: some verbose replaced by warnings in
ErrorCrit_* functions
---
DESCRIPTION | 4 ++--
NEWS.rmd | 2 +-
R/ErrorCrit_KGE.R | 2 +-
R/ErrorCrit_KGE2.R | 2 +-
R/ErrorCrit_NSE.R | 2 +-
R/ErrorCrit_RMSE.R | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 783d5584..3626ab0d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.15.4
-Date: 2018-10-15
+Version: 1.0.15.5
+Date: 2018-10-16
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Charles", "Perrin", role = c("aut", "ths"), comment = c(ORCID = "0000-0001-8552-1881")),
diff --git a/NEWS.rmd b/NEWS.rmd
index e9bc89c5..ddd00371 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.0.15.4 Release Notes (2018-10-15)
+### 1.0.15.5 Release Notes (2018-10-16)
diff --git a/R/ErrorCrit_KGE.R b/R/ErrorCrit_KGE.R
index dd15c658..33dd24c7 100644
--- a/R/ErrorCrit_KGE.R
+++ b/R/ErrorCrit_KGE.R
@@ -42,7 +42,7 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation
- if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) {
+ if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & warnings) {
if (any(VarObs %in% 0)) {
warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL")
}
diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R
index 37095d8e..66f0f889 100644
--- a/R/ErrorCrit_KGE2.R
+++ b/R/ErrorCrit_KGE2.R
@@ -42,7 +42,7 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation
- if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) {
+ if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & warnings) {
if (any(VarObs %in% 0)) {
warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL")
}
diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R
index 598778ce..d3adc5a3 100644
--- a/R/ErrorCrit_NSE.R
+++ b/R/ErrorCrit_NSE.R
@@ -42,7 +42,7 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation
- if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) {
+ if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & warnings) {
if (any(VarObs %in% 0)) {
warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL")
}
diff --git a/R/ErrorCrit_RMSE.R b/R/ErrorCrit_RMSE.R
index b21a8af6..e15d48ae 100644
--- a/R/ErrorCrit_RMSE.R
+++ b/R/ErrorCrit_RMSE.R
@@ -42,7 +42,7 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation
- if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) {
+ if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & warnings) {
if (any(VarObs %in% 0)) {
warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL")
}
--
GitLab