v1.2.12.4 CLEAN: minor syntax revision of message in Calibration_Michel

DESCRIPTION

 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.12.3
+Version: 1.2.12.4
 Date: 2019-03-29
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

NEWS.rmd

@@ -13,7 +13,7 @@ output:
 
 
 
-### 1.2.12.3 Release Notes (2019-03-28) 
+### 1.2.12.4 Release Notes (2019-03-28) 
 
 
 

R/Calibration_Michel.R

@@ -224,7 +224,7 @@ Calibration_Michel <- function(InputsModel,
     OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param)
     
     ##Calibration_criterion_computation
-    OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE)      
+    OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE)
     if (!is.na(OutputsCrit$CritValue)) {
       if (OutputsCrit$CritValue * OutputsCrit$Multiplier < CritOptim) {
         CritOptim <- OutputsCrit$CritValue * OutputsCrit$Multiplier
@@ -250,7 +250,7 @@ Calibration_Michel <- function(InputsModel,
   }
   ParamStartT <- FUN_TRANSFO(ParamStartR, "RT")
   CritStart   <- CritOptim
-  NRuns       <- NRuns+nrow(CandidatesParamR)
+  NRuns       <- NRuns + nrow(CandidatesParamR)
   if (verbose) {
     if (Ncandidates > 1) {
       message(sprintf("\t Screening completed (%s runs)", NRuns))
@@ -259,7 +259,7 @@ Calibration_Michel <- function(InputsModel,
       message("\t Starting point for steepest-descent local search:")
     }
     message("\t     Param = ", paste(sprintf("%8.3f", ParamStartR), collapse = " , "))
-    message(sprintf("\t     Crit. %-12s = %.4f", CritName, CritStart * Multiplier), "\n")
+    message(sprintf("\t     Crit. %-12s = %.4f", CritName, CritStart * Multiplier))
   }
   ##Results_archiving________________________________________________________
   HistParamR[1, ] <- ParamStartR
@@ -479,10 +479,10 @@ Calibration_Michel <- function(InputsModel,
       listNameCrit <- OutputsCrit$CritCompo$MultiCritNames
       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)
-      message("\tFormula: mean(", msgForm, ")\n")
+      msgForm <- gsub("\\,\\\n\\\t\\\t    $|\\,$", "", msgForm)
+      message("\tFormula: sum(", msgForm, ")\n")
     }
   }
   ##Results_archiving_______________________________________________________