Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
HYCAR-Hydro
airGR
Commits
c6d21f38
Commit
c6d21f38
authored
Apr 03, 2019
by
Delaigue Olivier
Browse files
v1.2.13.9 CLEAN: minor revision of messages in Calibration_Michel
parent
f5730cc1
Changes
3
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
c6d21f38
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.13.
8
Date: 2019-04-0
2
Version: 1.2.13.
9
Date: 2019-04-0
3
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"),
...
...
NEWS.rmd
View file @
c6d21f38
...
...
@@ -13,7 +13,7 @@ output:
### 1.2.13.
8
Release Notes (2019-04-0
2
)
### 1.2.13.
9
Release Notes (2019-04-0
3
)
...
...
R/Calibration_Michel.R
View file @
c6d21f38
...
...
@@ -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_______________________________________________________
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment