Skip to content
GitLab
Commit d7162e4f authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.0.13.7 remove tests on Ind_zeroes in ErrorCrit* functions

parent 493d6154
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 161-runmodel_lag-proposal-for-a-better-transformation-and-screening-of-the-parameters 165-add-missing-isintstore-argument-in-createcaliboptions 171-check-error-direct-call-of-as-data-frame-posixct-is-deprecated-use-as-data-frame-vector-or-as 191-speed-up-runmodel_lag-when-it-is-used-alone 33-merge-airgr-and-airgrplus-functions 60-migrate-transfoparam-functions-and-createcaliboptions-to-s3-methods 96-parallelize-the-grid-screening-step-during-calibration airGRplus master rmOptions CRAN_v1.7.6 CRAN_v1.7.5 CRAN_v1.7.4 CRAN_v1.7.3 CRAN_v1.7.2 CRAN_v1.7.1 CRAN_v1.7.0 CRAN_v1.6.12 CRAN_v1.6.11 CRAN_v1.6.10.4 CRAN_v1.6.9.27 CRAN_v1.6.9.24 CRAN_v1.6.9.23 CRAN_v1.6.9.21 CRAN_v1.4.3.65 CRAN_v1.4.3.60 CRAN_v1.4.3.52 CRAN_v1.3.2.42 CRAN_v1.3.2.41 CRAN_v1.3.2.40 CRAN_v1.3.2.39 CRAN_v1.3.2.23 CRAN_v1.3.2.17 CRAN_v1.2.13.16 CRAN_v1.2.13.13 CRAN_v1.0.14.1 CRAN_v1.0.13.19
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 22 deletions
+14 -22
DESCRIPTION
+ 1
− 1
View file @ d7162e4f
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.0.13.6 Version: 1.0.13.7
Date: 2018-08-29 Date: 2018-08-29
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
NEWS.rmd
+ 1
− 1
View file @ d7162e4f
...@@ -14,7 +14,7 @@ output: ...@@ -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 #### Deprectated and defunct
......
R/ErrorCrit_KGE.R
+ 3
− 5
View file @ d7162e4f
...@@ -42,11 +42,9 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ...@@ -42,11 +42,9 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim[!InputsCrit$BoolCrit] <- NA VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation ##Data_transformation
if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) { if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
if (length(InputsCrit$Ind_zeroes) > 0) { VarObs <- VarObs + InputsCrit$epsilon
VarObs <- VarObs + InputsCrit$epsilon VarSim <- VarSim + InputsCrit$epsilon
VarSim <- VarSim + InputsCrit$epsilon
}
} }
if (InputsCrit$transfo == "sqrt") { if (InputsCrit$transfo == "sqrt") {
VarObs <- sqrt(VarObs) VarObs <- sqrt(VarObs)
......
R/ErrorCrit_KGE2.R
+ 3
− 5
View file @ d7162e4f
...@@ -42,11 +42,9 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ...@@ -42,11 +42,9 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim[!InputsCrit$BoolCrit] <- NA VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation ##Data_transformation
if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) { if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
if (length(InputsCrit$Ind_zeroes) > 0) { VarObs <- VarObs + InputsCrit$epsilon
VarObs <- VarObs + InputsCrit$epsilon VarSim <- VarSim + InputsCrit$epsilon
VarSim <- VarSim + InputsCrit$epsilon
}
} }
if (InputsCrit$transfo == "sqrt") { if (InputsCrit$transfo == "sqrt") {
VarObs <- sqrt(VarObs) VarObs <- sqrt(VarObs)
......
R/ErrorCrit_NSE.R
+ 3
− 5
View file @ d7162e4f
...@@ -42,11 +42,9 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ...@@ -42,11 +42,9 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim[!InputsCrit$BoolCrit] <- NA VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation ##Data_transformation
if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) { if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
if (length(InputsCrit$Ind_zeroes) > 0) { VarObs <- VarObs + InputsCrit$epsilon
VarObs <- VarObs + InputsCrit$epsilon VarSim <- VarSim + InputsCrit$epsilon
VarSim <- VarSim + InputsCrit$epsilon
}
} }
if (InputsCrit$transfo == "sqrt") { if (InputsCrit$transfo == "sqrt") {
VarObs <- sqrt(VarObs) VarObs <- sqrt(VarObs)
......
R/ErrorCrit_RMSE.R
+ 3
− 5
View file @ d7162e4f
...@@ -42,11 +42,9 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ...@@ -42,11 +42,9 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim[!InputsCrit$BoolCrit] <- NA VarSim[!InputsCrit$BoolCrit] <- NA
##Data_transformation ##Data_transformation
if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) { if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
if (length(InputsCrit$Ind_zeroes) > 0) { VarObs <- VarObs + InputsCrit$epsilon
VarObs <- VarObs + InputsCrit$epsilon VarSim <- VarSim + InputsCrit$epsilon
VarSim <- VarSim + InputsCrit$epsilon
}
} }
if (InputsCrit$transfo == "sqrt") { if (InputsCrit$transfo == "sqrt") {
VarObs <- sqrt(VarObs) VarObs <- sqrt(VarObs)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment