From bec014da6f350488842cc07b5cebf03ed12bc038 Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.priv> Date: Wed, 27 Mar 2019 11:13:10 +0100 Subject: [PATCH] v1.2.11.17 CLEAN: blank line removed in ErrorCrit --- DESCRIPTION | 2 +- NEWS.rmd | 2 +- R/ErrorCrit.R | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d123a3ef..6d93bc53 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.11.16 +Version: 1.2.11.17 Date: 2019-03-27 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 97cc7893..88d99c4e 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.11.16 Release Notes (2019-03-27) +### 1.2.11.17 Release Notes (2019-03-27) diff --git a/R/ErrorCrit.R b/R/ErrorCrit.R index 5ea035f3..5c997e27 100644 --- a/R/ErrorCrit.R +++ b/R/ErrorCrit.R @@ -41,7 +41,6 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo listweights <- unlist(lapply(InputsCrit, function(x) x[["weights"]])) listweights <- listweights / sum(listweights) - if (inherits(InputsCrit, "Compo")) { CritValue <- sum(listValCrit * listweights) OutputsCritCompo <- list(MultiCritValues = listValCrit, -- GitLab