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

v1.2.14.12 CLEAN: simplified code of the ErrorCrit_* funs

parent 4f8c1383
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 60-migrate-transfoparam-functions-and-createcaliboptions-to-s3-methods 96-parallelize-the-grid-screening-step-during-calibration airGRplus cleanAirGRplus master 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
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 58 deletions
+34 -58
DESCRIPTION
+ 1
− 1
View file @ 3565d8b5
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.2.14.11 Version: 1.2.14.12
Date: 2019-04-17 Date: 2019-04-17
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 @ 3565d8b5
...@@ -14,7 +14,7 @@ output: ...@@ -14,7 +14,7 @@ output:
### 1.2.14.11 Release Notes (2019-04-17) ### 1.2.14.12 Release Notes (2019-04-17)
#### New features #### New features
......
R/ErrorCrit_KGE.R
+ 13
− 26
View file @ 3565d8b5
...@@ -7,25 +7,18 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ...@@ -7,25 +7,18 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
EC <- .ErrorCrit(InputsCrit = InputsCrit, Crit = "KGE", OutputsModel = OutputsModel, warnings = warnings) EC <- .ErrorCrit(InputsCrit = InputsCrit, Crit = "KGE", OutputsModel = OutputsModel, warnings = warnings)
if (!EC$CritCompute) { CritValue <- NA
CritValue <- NA SubCritValues <- rep(NA, 3)
SubCritValues <- NA SubCritNames <- c("r", "alpha", "beta")
SubCritNames <- NA SubCritPrint <- rep(NA, 3)
} else {
if (EC$CritCompute) {
## Other variables preparation ## Other variables preparation
meanVarObs <- mean(EC$VarObs[!EC$TS_ignore]) meanVarObs <- mean(EC$VarObs[!EC$TS_ignore])
meanVarSim <- mean(EC$VarSim[!EC$TS_ignore]) meanVarSim <- mean(EC$VarSim[!EC$TS_ignore])
iCrit <- 0
SubCritPrint <- NULL
SubCritNames <- NULL
SubCritValues <- NULL
## SubErrorCrit KGE rPearson ## SubErrorCrit KGE rPearson
iCrit <- iCrit + 1 SubCritPrint[1L] <- paste0(EC$CritName, " cor(sim, obs, \"pearson\") =")
SubCritPrint[iCrit] <- paste0(EC$CritName, " cor(sim, obs, \"pearson\") =")
SubCritValues[iCrit] <- NA
SubCritNames[iCrit] <- "r"
Numer <- sum((EC$VarObs[!EC$TS_ignore] - meanVarObs) * (EC$VarSim[!EC$TS_ignore] - meanVarSim)) Numer <- sum((EC$VarObs[!EC$TS_ignore] - meanVarObs) * (EC$VarSim[!EC$TS_ignore] - meanVarSim))
Deno1 <- sqrt(sum((EC$VarObs[!EC$TS_ignore] - meanVarObs) ^ 2)) Deno1 <- sqrt(sum((EC$VarObs[!EC$TS_ignore] - meanVarObs) ^ 2))
...@@ -41,14 +34,11 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ...@@ -41,14 +34,11 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
Crit <- Numer / (Deno1 * Deno2) Crit <- Numer / (Deno1 * Deno2)
} }
if (is.numeric(Crit) & is.finite(Crit)) { if (is.numeric(Crit) & is.finite(Crit)) {
SubCritValues[iCrit] <- Crit SubCritValues[1L] <- Crit
} }
## SubErrorCrit KGE alpha ## SubErrorCrit KGE alpha
iCrit <- iCrit + 1 SubCritPrint[2L] <- paste0(EC$CritName, " sd(sim)/sd(obs) =")
SubCritPrint[iCrit] <- paste0(EC$CritName, " sd(sim)/sd(obs) =")
SubCritValues[iCrit] <- NA
SubCritNames[iCrit] <- "alpha"
Numer <- sd(EC$VarSim[!EC$TS_ignore]) Numer <- sd(EC$VarSim[!EC$TS_ignore])
Denom <- sd(EC$VarObs[!EC$TS_ignore]) Denom <- sd(EC$VarObs[!EC$TS_ignore])
...@@ -59,14 +49,11 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ...@@ -59,14 +49,11 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
Crit <- Numer / Denom Crit <- Numer / Denom
} }
if (is.numeric(Crit) & is.finite(Crit)) { if (is.numeric(Crit) & is.finite(Crit)) {
SubCritValues[iCrit] <- Crit SubCritValues[2L] <- Crit
} }
## SubErrorCrit KGE beta ## SubErrorCrit KGE beta
iCrit <- iCrit + 1 SubCritPrint[3L] <- paste0(EC$CritName, " mean(sim)/mean(obs) =")
SubCritPrint[iCrit] <- paste0(EC$CritName, " mean(sim)/mean(obs) =")
SubCritValues[iCrit] <- NA
SubCritNames[iCrit] <- "beta"
if (meanVarSim == 0 & meanVarObs == 0) { if (meanVarSim == 0 & meanVarObs == 0) {
Crit <- 1 Crit <- 1
...@@ -74,12 +61,12 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ...@@ -74,12 +61,12 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
Crit <- meanVarSim / meanVarObs Crit <- meanVarSim / meanVarObs
} }
if (is.numeric(Crit) & is.finite(Crit)) { if (is.numeric(Crit) & is.finite(Crit)) {
SubCritValues[iCrit] <- Crit SubCritValues[3L] <- Crit
} }
## ErrorCrit ## ErrorCrit
if (sum(is.na(SubCritValues)) == 0) { if (sum(is.na(SubCritValues)) == 0) {
CritValue <- (1 - sqrt((SubCritValues[1] - 1)^2 + (SubCritValues[2] - 1)^2 + (SubCritValues[3] - 1)^2)) CritValue <- (1 - sqrt((SubCritValues[1L] - 1)^2 + (SubCritValues[2L] - 1)^2 + (SubCritValues[3L] - 1)^2))
} }
## Verbose ## Verbose
......
R/ErrorCrit_KGE2.R
+ 13
− 24
View file @ 3565d8b5
...@@ -7,23 +7,18 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ...@@ -7,23 +7,18 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
EC <- .ErrorCrit(InputsCrit = InputsCrit, Crit = "KGE2", OutputsModel = OutputsModel, warnings = warnings) EC <- .ErrorCrit(InputsCrit = InputsCrit, Crit = "KGE2", OutputsModel = OutputsModel, warnings = warnings)
if (!EC$CritCompute) { CritValue <- NA
CritValue <- NA SubCritValues <- rep(NA, 3)
} else { SubCritNames <- c("r", "gamma", "beta")
SubCritPrint <- rep(NA, 3)
if (EC$CritCompute) {
## Other variables preparation ## Other variables preparation
meanVarObs <- mean(EC$VarObs[!EC$TS_ignore]) meanVarObs <- mean(EC$VarObs[!EC$TS_ignore])
meanVarSim <- mean(EC$VarSim[!EC$TS_ignore]) meanVarSim <- mean(EC$VarSim[!EC$TS_ignore])
iCrit <- 0
SubCritPrint <- NULL
SubCritNames <- NULL
SubCritValues <- NULL
## SubErrorCrit KGE rPearson ## SubErrorCrit KGE rPearson
iCrit <- iCrit + 1 SubCritPrint[1L] <- paste0(EC$CritName, " cor(sim, obs, \"pearson\") =")
SubCritPrint[iCrit] <- paste0(EC$CritName, " cor(sim, obs, \"pearson\") =")
SubCritValues[iCrit] <- NA
SubCritNames[iCrit] <- "r"
Numer <- sum((EC$VarObs[!EC$TS_ignore] - meanVarObs) * (EC$VarSim[!EC$TS_ignore] - meanVarSim)) Numer <- sum((EC$VarObs[!EC$TS_ignore] - meanVarObs) * (EC$VarSim[!EC$TS_ignore] - meanVarSim))
Deno1 <- sqrt(sum((EC$VarObs[!EC$TS_ignore] - meanVarObs)^2)) Deno1 <- sqrt(sum((EC$VarObs[!EC$TS_ignore] - meanVarObs)^2))
...@@ -39,14 +34,11 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ...@@ -39,14 +34,11 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
Crit <- Numer / (Deno1 * Deno2) Crit <- Numer / (Deno1 * Deno2)
} }
if (is.numeric(Crit) & is.finite(Crit)) { if (is.numeric(Crit) & is.finite(Crit)) {
SubCritValues[iCrit] <- Crit SubCritValues[1L] <- Crit
} }
## SubErrorCrit KGE gamma ## SubErrorCrit KGE gamma
iCrit <- iCrit + 1 SubCritPrint[2L] <- paste0(EC$CritName, " cv(sim)/cv(obs) =")
SubCritPrint[iCrit] <- paste0(EC$CritName, " cv(sim)/cv(obs) =")
SubCritValues[iCrit] <- NA
SubCritNames[iCrit] <- "gamma"
if (meanVarSim == 0) { if (meanVarSim == 0) {
if (sd(EC$VarSim[!EC$TS_ignore]) == 0) { if (sd(EC$VarSim[!EC$TS_ignore]) == 0) {
...@@ -74,14 +66,11 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ...@@ -74,14 +66,11 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
Crit <- CVsim / CVobs Crit <- CVsim / CVobs
} }
if (is.numeric(Crit) & is.finite(Crit)) { if (is.numeric(Crit) & is.finite(Crit)) {
SubCritValues[iCrit] <- Crit SubCritValues[2L] <- Crit
} }
## SubErrorCrit KGE beta ## SubErrorCrit KGE beta
iCrit <- iCrit + 1 SubCritPrint[3L] <- paste0(EC$CritName, " mean(sim)/mean(obs) =")
SubCritPrint[iCrit] <- paste0(EC$CritName, " mean(sim)/mean(obs) =")
SubCritValues[iCrit] <- NA
SubCritNames[iCrit] <- "beta"
if (meanVarSim == 0 & meanVarObs == 0) { if (meanVarSim == 0 & meanVarObs == 0) {
Crit <- 1 Crit <- 1
...@@ -89,12 +78,12 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ...@@ -89,12 +78,12 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
Crit <- meanVarSim / meanVarObs Crit <- meanVarSim / meanVarObs
} }
if (is.numeric(Crit) & is.finite(Crit)) { if (is.numeric(Crit) & is.finite(Crit)) {
SubCritValues[iCrit] <- Crit SubCritValues[3L] <- Crit
} }
## ErrorCrit ## ErrorCrit
if (sum(is.na(SubCritValues)) == 0) { if (sum(is.na(SubCritValues)) == 0) {
CritValue <- (1 - sqrt((SubCritValues[1] - 1)^2 + (SubCritValues[2] - 1)^2 + (SubCritValues[3] - 1)^2)) CritValue <- (1 - sqrt((SubCritValues[1L] - 1)^2 + (SubCritValues[2L] - 1)^2 + (SubCritValues[3L] - 1)^2))
} }
## Verbose ## Verbose
......
R/ErrorCrit_NSE.R
+ 3
− 3
View file @ 3565d8b5
...@@ -7,9 +7,9 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ...@@ -7,9 +7,9 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
EC <- .ErrorCrit(InputsCrit = InputsCrit, Crit = "NSE", OutputsModel = OutputsModel, warnings = warnings) EC <- .ErrorCrit(InputsCrit = InputsCrit, Crit = "NSE", OutputsModel = OutputsModel, warnings = warnings)
if (!EC$CritCompute) { CritValue <- NA
CritValue <- NA
} else { if (EC$CritCompute) {
## Other variables preparation ## Other variables preparation
meanVarObs <- mean(EC$VarObs[!EC$TS_ignore]) meanVarObs <- mean(EC$VarObs[!EC$TS_ignore])
meanVarSim <- mean(EC$VarSim[!EC$TS_ignore]) meanVarSim <- mean(EC$VarSim[!EC$TS_ignore])
......
R/ErrorCrit_RMSE.R
+ 3
− 3
View file @ 3565d8b5
...@@ -7,9 +7,9 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ...@@ -7,9 +7,9 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
EC <- .ErrorCrit(InputsCrit = InputsCrit, Crit = "RMSE", OutputsModel = OutputsModel, warnings = warnings) EC <- .ErrorCrit(InputsCrit = InputsCrit, Crit = "RMSE", OutputsModel = OutputsModel, warnings = warnings)
if (!EC$CritCompute) { CritValue <- NA
CritValue <- NA
} else { if (EC$CritCompute) {
## ErrorCrit ## ErrorCrit
Numer <- sum((EC$VarSim - EC$VarObs)^2, na.rm = TRUE) Numer <- sum((EC$VarSim - EC$VarObs)^2, na.rm = TRUE)
Denom <- sum(!is.na(EC$VarObs)) Denom <- sum(!is.na(EC$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