diff --git a/DESCRIPTION b/DESCRIPTION index 10fb72877f21fe306524c41463963c6d5eea1da4..81030809f49f1b3e517c138dabefb6bcfe1897d7 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.1.2.42 -Date: 2019-02-19 +Version: 1.1.2.43 +Date: 2019-02-21 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 26a690c1a605144363c326604be9f60b3b6a89f8..d26d44140459d930bfc9e9f35a6c1044ab59ab50 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.1.2.42 Release Notes (2019-02-19) +### 1.1.2.43 Release Notes (2019-02-21) diff --git a/R/ErrorCrit.R b/R/ErrorCrit.R index 7bbd69fb1df2c54a63decfd64da50bc41aa5e0de..feef2360688ab5408477ef8c680e5d7f0f88ff09 100644 --- a/R/ErrorCrit.R +++ b/R/ErrorCrit.R @@ -37,10 +37,11 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo listValCrit <- sapply(listOutputsCrit, function(x) x[["CritValue"]]) listNameCrit <- sapply(listOutputsCrit, function(x) x[["CritName"]]) listweights <- unlist(lapply(InputsCrit, function(x) x[["weights"]])) + listweights <- listweights / sum(listweights) if (inherits(InputsCrit, "Compo")) { - CritValue <- sum(listValCrit * (listweights / sum(listweights))) + CritValue <- sum(listValCrit * listweights) OutputsCritCompo <- list(MultiCritValues = listValCrit, MultiCritNames = listNameCrit, MultiCritWeights = listweights)