diff --git a/DESCRIPTION b/DESCRIPTION index 501042c6dc0980e8e029b59260ca5cd1a10c78e8..cd1235662a7dd13d32edf55af92f63caa73dc00c 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.0.11.1 -Date: 2018-08-09 +Version: 1.0.12.0 +Date: 2018-08-28 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Charles", "Perrin", role = c("aut", "ths"), comment = c(ORCID = "0000-0001-8552-1881")), diff --git a/NEWS.rmd b/NEWS.rmd index a984602f8683eb929adaaa23bcfa5f58a9827143..351ad22be41dacbe450d30b8a289265ca0bc2e20 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -14,6 +14,13 @@ output: +### 1.0.12.0 Release Notes (2018-08-28) + +#### Major user-visible changes + +- <code>Calibration_Michel()</code> is now faster during the grid-screening step when a parameter is set using <code>FixedParam</code> in <code>CreateCalibOptions</code>. + + ### 1.0.11.0 Release Notes (2018-07-18) diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R index f5433f500780977be388a9a44d1f34d07aba0324..691d113401d5038da98f1ccb2ef6368bfc7d11c7 100644 --- a/R/Calibration_Michel.R +++ b/R/Calibration_Michel.R @@ -119,7 +119,9 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions ##Definition_of_the_function_creating_all_possible_parameter_sets_from_different_values_for_each_parameter ProposeCandidatesGrid <- function(DistribParam) { - Output <- list(NewCandidates = expand.grid(lapply(seq_len(ncol(DistribParamR)), function(x) DistribParam[, x]))) + NewCandidates <- expand.grid(lapply(seq_len(ncol(DistribParamR)), function(x) DistribParam[, x])) + NewCandidates <- unique(NewCandidates) # to avoid duplicates when a parameter is set + Output <- list(NewCandidates = NewCandidates) }