From 04847de52841a4d334c7d0ac97cc531a7069de44 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Thu, 28 Mar 2019 17:43:57 +0100
Subject: [PATCH] v1.2.12.3 CLEAN: minor syntax revision of message in
ErrorCrit
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/ErrorCrit.R | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 6f087f4c..1b01bc66 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.2
+Version: 1.2.12.3
Date: 2019-03-29
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 c9769d35..3847a50f 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.12.2 Release Notes (2019-03-28)
+### 1.2.12.3 Release Notes (2019-03-28)
diff --git a/R/ErrorCrit.R b/R/ErrorCrit.R
index 5c997e27..e4ae8c26 100644
--- a/R/ErrorCrit.R
+++ b/R/ErrorCrit.R
@@ -59,9 +59,9 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo
message("Crit. Composite = ", sprintf("%.4f", CritValue))
msgForm <- paste(sprintf("%.2f", listweights), listNameCrit, sep = " * ", collapse = ", ")
msgForm <- unlist(strsplit(msgForm, split = ","))
- msgFormSep <- rep(c(",", ",", ",\n\t\t "), times = ceiling(length(msgForm)/3))[1: length(msgForm)]
+ msgFormSep <- rep(c(",", ",", ",\n\t\t "), times = ceiling(length(msgForm)/3))[1: length(msgForm)]
msgForm <- paste(msgForm, msgFormSep, sep = "", collapse = "")
- msgForm <- gsub("\\,\\\n\\\t\\\t $|\\,$", "", msgForm)
+ msgForm <- gsub("\\,\\\n\\\t\\\t $|\\,$", "", msgForm)
message("\tFormula: sum(", msgForm, ")\n")
}
} else {
--
GitLab