From 0eeea88677b625a8333512cf94d3fe16e476ea54 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 1 Apr 2019 14:20:49 +0200
Subject: [PATCH] v1.2.12.30 UPDATE: ErrorCrit now use Weights argument of
CreateIntputsCrit weights varObs
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/ErrorCrit.R | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 8b8c2a8f..0af67793 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
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")),
diff --git a/NEWS.rmd b/NEWS.rmd
index d5d3bc99..ce2c0043 100644
--- 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)
diff --git a/R/ErrorCrit.R b/R/ErrorCrit.R
index e4ae8c26..53f65119 100644
--- 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")) {
--
GitLab