From 493d6154675a90ece832dd0577fe7bf7a643e0ce Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 29 Aug 2018 17:32:48 +0200
Subject: [PATCH] v1.0.13.6 ErrorCrit* function cleaned
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/ErrorCrit_KGE.R | 4 ++--
R/ErrorCrit_KGE2.R | 4 ++--
R/ErrorCrit_NSE.R | 4 ++--
R/ErrorCrit_RMSE.R | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 8a4e4779..903d219f 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.5
+Version: 1.0.13.6
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 8dda1d5f..1d3acea6 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.0.13.5 Release Notes (2018-08-29)
+### 1.0.13.6 Release Notes (2018-08-29)
#### Deprectated and defunct
diff --git a/R/ErrorCrit_KGE.R b/R/ErrorCrit_KGE.R
index e7924885..fa82de17 100644
--- a/R/ErrorCrit_KGE.R
+++ b/R/ErrorCrit_KGE.R
@@ -2,11 +2,11 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
##Arguments_check________________________________
- if (inherits(InputsCrit, "InputsCrit") == FALSE) {
+ if (!inherits(InputsCrit, "InputsCrit")) {
stop("InputsCrit must be of class 'InputsCrit' \n")
return(NULL)
}
- if (inherits(OutputsModel, "OutputsModel") == FALSE) {
+ if (!inherits(OutputsModel, "OutputsModel")) {
stop("OutputsModel must be of class 'OutputsModel' \n")
return(NULL)
}
diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R
index 11ef1c18..88b1d6b8 100644
--- a/R/ErrorCrit_KGE2.R
+++ b/R/ErrorCrit_KGE2.R
@@ -2,11 +2,11 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
##Arguments_check________________________________
- if (inherits(InputsCrit, "InputsCrit") == FALSE) {
+ if (!inherits(InputsCrit, "InputsCrit")) {
stop("InputsCrit must be of class 'InputsCrit' \n")
return(NULL)
}
- if (inherits(OutputsModel, "OutputsModel") == FALSE) {
+ if (!inherits(OutputsModel, "OutputsModel")) {
stop("OutputsModel must be of class 'OutputsModel' \n")
return(NULL)
}
diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R
index 3a79ad3d..b65f7224 100644
--- a/R/ErrorCrit_NSE.R
+++ b/R/ErrorCrit_NSE.R
@@ -2,11 +2,11 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
##Arguments_check________________________________
- if (inherits(InputsCrit, "InputsCrit") == FALSE) {
+ if (!inherits(InputsCrit, "InputsCrit")) {
stop("InputsCrit must be of class 'InputsCrit' \n")
return(NULL)
}
- if (inherits(OutputsModel, "OutputsModel") == FALSE) {
+ if (!inherits(OutputsModel, "OutputsModel")) {
stop("OutputsModel must be of class 'OutputsModel' \n")
return(NULL)
}
diff --git a/R/ErrorCrit_RMSE.R b/R/ErrorCrit_RMSE.R
index e137ee09..085871cc 100644
--- a/R/ErrorCrit_RMSE.R
+++ b/R/ErrorCrit_RMSE.R
@@ -2,11 +2,11 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
##Arguments_check________________________________
- if (inherits(InputsCrit, "InputsCrit") == FALSE) {
+ if (!inherits(InputsCrit, "InputsCrit")) {
stop("InputsCrit must be of class 'InputsCrit' \n")
return(NULL)
}
- if (inherits(OutputsModel, "OutputsModel") == FALSE) {
+ if (!inherits(OutputsModel, "OutputsModel")) {
stop("OutputsModel must be of class 'OutputsModel' \n")
return(NULL)
}
--
GitLab