v1.0.13.7 remove tests on Ind_zeroes in ErrorCrit* functions

DESCRIPTION

 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")),

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

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)

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)

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)

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)