Commit 41bf02dd authored by unknown's avatar unknown
Browse files

v1.0.4.2 function Calibration_Michel() cleaned (message() function)

parent 336d5e9b
Package: airGR
Type: Package
Title: Suite of GR hydrological models for precipitation-runoff modelling
Version: 1.0.4.1
Version: 1.0.4.2
Date: 2017-01-18
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
......
......@@ -228,13 +228,13 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions
NRuns <- NRuns+nrow(CandidatesParamR)
if (verbose) {
if (Ncandidates > 1) {
message("\t Screening completed (", NRuns, " runs):")
message(sprintf("\t Screening completed (%s runs)", NRuns))
}
if (Ncandidates == 1) {
message("\t Starting point for steepest-descent local search:")
}
message("\t Param = ", paste(formatC(ParamStartR, format = "f", width = 8, digits = 3), collapse = " , "))
message("\t Crit ", format(CritName, width = 12, justify = "left"), " = ", formatC(CritStart*Multiplier, format = "f", digits = 4))
message("\t Param = ", paste(sprintf("%8.3f", ParamStartR), collapse = " , "))
message(sprintf("\t Crit %-12s = %.4f", CritName, CritStart*Multiplier))
}
##Results_archiving________________________________________________________
HistParamR[1, ] <- ParamStartR
......@@ -452,9 +452,9 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions
CritFinal <- CritOptim
NIter <- 1 + ITER
if (verbose) {
message("\t Calibration completed (", NIter, " iterations, ", NRuns, " runs)")
message("\t Param = ", paste(formatC(ParamFinalR, format = "f", width = 8, digits = 3), collapse = " , "))
message("\t Crit ", format(CritName, width = 12, justify = "left"), " = ", formatC(CritFinal*Multiplier, format = "f", digits = 4))
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))
}
##Results_archiving_______________________________________________________
HistParamR <- cbind(HistParamR[1:NIter, ])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment