v1.2.12.30 UPDATE: ErrorCrit now use Weights argument of CreateIntputsCrit weights varObs

0eeea886 · Delaigue Olivier · ec429713 · 0eeea886 · 0eeea886 · 0eeea886
Commit 0eeea886 authored 6 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 3 deletions
+3 -3
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.12.29
+Version: 1.2.12.30
 Date: 2019-04-01
 Authors@R: c(
  person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:



-### 1.2.12.28 Release Notes (2019-04-01) 
+### 1.2.12.30 Release Notes (2019-04-01) 




--- a/R/ErrorCrit.R
+++ b/R/ErrorCrit.R
@@ -38,7 +38,7 @@ 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  <- unlist(lapply(InputsCrit, function(x) x[["Weights"]]))
    listweights <- listweights / sum(listweights)
    
    if (inherits(InputsCrit, "Compo")) {