From c6d21f381a78d769d8db9a35d94c31b5d240b471 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 3 Apr 2019 12:00:25 +0200
Subject: [PATCH] v1.2.13.9 CLEAN: minor revision of messages in
Calibration_Michel
---
DESCRIPTION | 4 ++--
NEWS.rmd | 2 +-
R/Calibration_Michel.R | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index e1705ce7..a237d394 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.13.8
-Date: 2019-04-02
+Version: 1.2.13.9
+Date: 2019-04-03
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"),
diff --git a/NEWS.rmd b/NEWS.rmd
index 5ca0fede..a4eaddcb 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.13.8 Release Notes (2019-04-02)
+### 1.2.13.9 Release Notes (2019-04-03)
diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R
index 377ccc7a..122c50d0 100644
--- a/R/Calibration_Michel.R
+++ b/R/Calibration_Michel.R
@@ -258,7 +258,7 @@ Calibration_Michel <- function(InputsModel,
if (Ncandidates == 1) {
message("\t Starting point for steepest-descent local search:")
}
- message("\t Param = ", paste(sprintf("%8.3f", ParamStartR), collapse = " , "))
+ message("\t Param = ", paste(sprintf("%8.3f", ParamStartR), collapse = ", "))
message(sprintf("\t Crit. %-12s = %.4f", CritName, CritStart * Multiplier))
}
##Results_archiving________________________________________________________
@@ -472,8 +472,8 @@ Calibration_Michel <- function(InputsModel,
NIter <- 1 + ITER
if (verbose) {
message(sprintf("\t Calibration completed (%s iterations, %s runs)", NIter, NRuns))
- message("\t Param = ", paste(sprintf("%8.3f", ParamFinalR), collapse = " , "))
- message(sprintf("\t Crit. %-12s = %.4f", CritName, CritFinal * Multiplier), "\n")
+ message("\t Param = ", paste(sprintf("%8.3f", ParamFinalR), collapse = ", "))
+ message(sprintf("\t Crit. %-12s = %.4f", CritName, CritFinal * Multiplier))
if (inherits(InputsCrit, "Compo")) {
listweights <- OutputsCrit$CritCompo$MultiCritWeights
listNameCrit <- OutputsCrit$CritCompo$MultiCritNames
@@ -482,7 +482,7 @@ Calibration_Michel <- function(InputsModel,
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)
- message("\tFormula: sum(", msgForm, ")\n")
+ message("\tFormula: sum(", msgForm, ")")
}
}
##Results_archiving_______________________________________________________
--
GitLab