v1.1.2.43 CLEAN: ErrorCrit now returns rescaled weights of composite criterion

761c2d55 · Delaigue Olivier · 13c1b616 · 761c2d55 · 761c2d55 · 761c2d55
Commit 761c2d55 authored 6 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 4 deletions
+5 -4
--- a/DESCRIPTION
+++ b/DESCRIPTION
 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")),

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




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