Skip to content
GitLab
Commit 083e9fdf authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

style: format comments in CreateCalibOptions

parent 58182222
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 161-runmodel_lag-proposal-for-a-better-transformation-and-screening-of-the-parameters 165-add-missing-isintstore-argument-in-createcaliboptions 171-check-error-direct-call-of-as-data-frame-posixct-is-deprecated-use-as-data-frame-vector-or-as 191-speed-up-runmodel_lag-when-it-is-used-alone 33-merge-airgr-and-airgrplus-functions 96-parallelize-the-grid-screening-step-during-calibration master rmOptions CRAN_v1.7.6 CRAN_v1.7.5 CRAN_v1.7.4 CRAN_v1.7.3 CRAN_v1.7.2 CRAN_v1.7.1 CRAN_v1.7.0 CRAN_v1.6.12 CRAN_v1.6.11 CRAN_v1.6.10.4
1 merge request!29CRAN v1.6.10.4
Pipeline #19778 passed with stages
in 15 minutes and 48 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 12 deletions
+12 -12
R/CreateCalibOptions.R
+ 12
− 12
View file @ 083e9fdf
...@@ -21,7 +21,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -21,7 +21,7 @@ CreateCalibOptions <- function(FUN_MOD,
if (!is.logical(IsSD) | length(IsSD) != 1L) { if (!is.logical(IsSD) | length(IsSD) != 1L) {
stop("'IsSD' must be a logical of length 1") stop("'IsSD' must be a logical of length 1")
} }
##check_FUN_MOD ## check FUN_MOD
BOOL <- FALSE BOOL <- FALSE
if (identical(FUN_MOD, RunModel_GR4H)) { if (identical(FUN_MOD, RunModel_GR4H)) {
...@@ -87,7 +87,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -87,7 +87,7 @@ CreateCalibOptions <- function(FUN_MOD,
return(NULL) return(NULL)
} }
##check_FUN_CALIB ## check FUN_CALIB
BOOL <- FALSE BOOL <- FALSE
if (identical(FUN_CALIB, Calibration_Michel)) { if (identical(FUN_CALIB, Calibration_Michel)) {
...@@ -100,9 +100,9 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -100,9 +100,9 @@ CreateCalibOptions <- function(FUN_MOD,
} }
##check_FUN_TRANSFO ## check FUN_TRANSFO
if (is.null(FUN_TRANSFO)) { if (is.null(FUN_TRANSFO)) {
##_set_FUN1 ## set FUN1
if (identical(FUN_MOD, RunModel_GR4H) | if (identical(FUN_MOD, RunModel_GR4H) |
identical(FUN_MOD, RunModel_CemaNeigeGR4H)) { identical(FUN_MOD, RunModel_CemaNeigeGR4H)) {
FUN_GR <- TransfoParam_GR4H FUN_GR <- TransfoParam_GR4H
...@@ -140,17 +140,17 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -140,17 +140,17 @@ CreateCalibOptions <- function(FUN_MOD,
stop("'FUN_GR' was not found") stop("'FUN_GR' was not found")
return(NULL) return(NULL)
} }
##_set_FUN2 ## set FUN2
if (IsHyst) { if (IsHyst) {
FUN_SNOW <- TransfoParam_CemaNeigeHyst FUN_SNOW <- TransfoParam_CemaNeigeHyst
} else { } else {
FUN_SNOW <- TransfoParam_CemaNeige FUN_SNOW <- TransfoParam_CemaNeige
} }
##_set_FUN_LAG ## set FUN_LAG
if (IsSD) { if (IsSD) {
FUN_LAG <- TransfoParam_Lag FUN_LAG <- TransfoParam_Lag
} }
##_set_FUN_TRANSFO ## set FUN_TRANSFO
if (sum(ObjectClass %in% c("GR4H", "GR5H", "GR4J", "GR5J", "GR6J", "GR2M", "GR1A", "CemaNeige")) > 0) { if (sum(ObjectClass %in% c("GR4H", "GR5H", "GR4J", "GR5J", "GR6J", "GR2M", "GR1A", "CemaNeige")) > 0) {
if (!IsSD) { if (!IsSD) {
FUN_TRANSFO <- FUN_GR FUN_TRANSFO <- FUN_GR
...@@ -252,7 +252,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -252,7 +252,7 @@ CreateCalibOptions <- function(FUN_MOD,
return(NULL) return(NULL)
} }
##NParam ## NParam
if ("GR4H" %in% ObjectClass) { if ("GR4H" %in% ObjectClass) {
NParam <- 4 NParam <- 4
} }
...@@ -299,7 +299,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -299,7 +299,7 @@ CreateCalibOptions <- function(FUN_MOD,
NParam <- NParam + 1 NParam <- NParam + 1
} }
##check_FixedParam ## check FixedParam
if (is.null(FixedParam)) { if (is.null(FixedParam)) {
FixedParam <- rep(NA, NParam) FixedParam <- rep(NA, NParam)
} else { } else {
...@@ -317,7 +317,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -317,7 +317,7 @@ CreateCalibOptions <- function(FUN_MOD,
} }
} }
##check_SearchRanges ## check SearchRanges
if (is.null(SearchRanges)) { if (is.null(SearchRanges)) {
ParamT <- matrix(c(rep(-9.99, NParam), rep(+9.99, NParam)), ParamT <- matrix(c(rep(-9.99, NParam), rep(+9.99, NParam)),
ncol = NParam, byrow = TRUE) ncol = NParam, byrow = TRUE)
...@@ -341,7 +341,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -341,7 +341,7 @@ CreateCalibOptions <- function(FUN_MOD,
} }
} }
##check_StartParamList_and_StartParamDistrib__default_values ## check StartParamList and StartParamDistrib default values
if (("HBAN" %in% ObjectClass & is.null(StartParamList) & is.null(StartParamDistrib))) { if (("HBAN" %in% ObjectClass & is.null(StartParamList) & is.null(StartParamDistrib))) {
if ("GR4H" %in% ObjectClass) { if ("GR4H" %in% ObjectClass) {
ParamT <- matrix(c(+5.12, -1.18, +4.34, -9.69, ParamT <- matrix(c(+5.12, -1.18, +4.34, -9.69,
...@@ -440,7 +440,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -440,7 +440,7 @@ CreateCalibOptions <- function(FUN_MOD,
} }
##check_StartParamList_and_StartParamDistrib__format ## check StartParamList and StartParamDistrib format
if ("HBAN" %in% ObjectClass & !is.null(StartParamList)) { if ("HBAN" %in% ObjectClass & !is.null(StartParamList)) {
if (!is.matrix(StartParamList)) { if (!is.matrix(StartParamList)) {
stop("'StartParamList' must be a matrix") stop("'StartParamList' must be a matrix")
......
Supports Markdown
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