Skip to content

Commit

Permalink
Update doc to pass checks
Browse files Browse the repository at this point in the history
  • Loading branch information
MayaGueguen committed Apr 30, 2024
1 parent 1735155 commit 55c9350
Show file tree
Hide file tree
Showing 100 changed files with 685 additions and 394 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: biomod2
Type: Package
Title: Ensemble Platform for Species Distribution Modeling
Version: 4.2-5
Date: 2024-04-04
Date: 2024-04-30
Authors@R: c(person("Wilfried", "Thuiller", role = c("aut")
, email = "[email protected]"),
person("Damien", "Georges", role = c("aut")),
Expand Down Expand Up @@ -75,7 +75,7 @@ Suggests:
tidyterra,
ggtext
License: GPL-3
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Encoding: UTF-8
VignetteBuilder: knitr
Collate:
Expand Down
2 changes: 1 addition & 1 deletion R/biomod2_globalVariables.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ utils::globalVariables(names = c("i.dim1",
"sub.i"))

## biomod2_classes_0 ------------
utils::globalVariables(names = c("expected_CVnames"))
utils::globalVariables(names = c("expected_CVnames", "OptionsBigboss"))

## biomod2_classes_1 ------------
utils::globalVariables(names = c("this_PA",
Expand Down
13 changes: 7 additions & 6 deletions R/bm_Tuning.R
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
##' \item{ANN}{\code{size}, \code{decay}, \code{bag}}
##' \item{CTA}{\code{maxdepth}}
##' \item{FDA}{\code{degree}, \code{nprune}}
##' \item{GAM.gam}{\code{span}, \code{degree}}
##' \item{GAM.mgcv}{\code{select}, \code{method}}
##' \item{GBM}{\code{n.trees}, \code{interaction.depth}, \code{shrinkage}, \code{n.minobsinnode}}
##' \item{MARS}{\code{degree}, \code{nprune}}
Expand All @@ -86,7 +87,7 @@
##'
##' @note
##' \itemize{
##' \item No tuning for \code{GAM.gam}, \code{GLM} and \code{MAXNET}
##' \item No tuning for \code{GLM} and \code{MAXNET}
##' \item \code{MAXENT} is tuned through \code{\link[ENMeval]{ENMevaluate}} function which is
##' calling either :
##' \itemize{
Expand Down Expand Up @@ -161,7 +162,7 @@
##' # tune parameters for Random Forest model
##' tuned.rf <- bm_Tuning(model = 'RF',
##' tuning.fun = 'rf', ## see in ModelsTable
##' do.formula = TRUE,
##' do.formula = FALSE,
##' bm.options = opt.d@options$RF.binary.randomForest.randomForest,
##' bm.format = myBiomodData)
##' tuned.rf
Expand Down Expand Up @@ -207,7 +208,7 @@ bm_Tuning <- function(model,
FDA.nprune = 2:38,
GAM.select = c(TRUE, FALSE),
GAM.method = c('GCV.Cp', 'GACV.Cp', 'REML', 'P-REML', 'ML', 'P-ML'),
GAM.span = c(0.3,0.5,0.7),
GAM.span = c(0.3, 0.5, 0.7),
GAM.degree = 1,
GBM.n.trees = c(500, 1000, 2500),
GBM.interaction.depth = seq(2, 8, by = 3),
Expand Down Expand Up @@ -592,7 +593,7 @@ bm_Tuning <- function(model,
FDA.nprune = 2:38,
GAM.select = c(TRUE, FALSE),
GAM.method = c('GCV.Cp', 'GACV.Cp', 'REML', 'P-REML', 'ML', 'P-ML'),
GAM.span = c(0.3,0.5,0.7),
GAM.span = c(0.3, 0.5, 0.7),
GAM.degree = 1,
GBM.n.trees = c(500, 1000, 2500),
GBM.interaction.depth = seq(2, 8, by = 3),
Expand Down Expand Up @@ -651,9 +652,9 @@ bm_Tuning <- function(model,
params.train = params.train[grep(model, names(params.train))]
.fun_testIfIn(TRUE, "names(params.train)", names(params.train), paste0(model, ".", train.params$params))
} else if (tuning.fun == "gamLoess"){
params.train = params.train[c('GAM.span',"GAM.degree")]
params.train = params.train[c('GAM.span', "GAM.degree")]
} else {
params.train = params.train[c('GAM.select','GAM.method')]
params.train = params.train[c('GAM.select', 'GAM.method')]
}
names(params.train) = sub(model, "", names(params.train))
tuning.grid <- do.call(expand.grid, params.train)
Expand Down
4 changes: 2 additions & 2 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/articles/examples_1_mainFunctions.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/articles/examples_2_secundaryFunctions.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 55c9350

Please sign in to comment.