Skip to content

Commit

Permalink
Mino corrections to pass checks
Browse files Browse the repository at this point in the history
  • Loading branch information
MayaGueguen committed Apr 4, 2024
1 parent 0a8f803 commit 20e9784
Show file tree
Hide file tree
Showing 23 changed files with 56 additions and 62 deletions.
2 changes: 1 addition & 1 deletion 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: 2023-09-12
Date: 2024-04-04
Authors@R: c(person("Wilfried", "Thuiller", role = c("aut")
, email = "[email protected]"),
person("Damien", "Georges", role = c("aut")),
Expand Down
1 change: 1 addition & 0 deletions R/BIOMOD_EnsembleForecasting.R
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@
##' plot(myBiomodEMProj)
##'
##'
##' @importFrom foreach foreach %dopar%
##' @importFrom terra rast `add<-` wrap writeRaster mask
##'
##'
Expand Down
1 change: 1 addition & 0 deletions R/BIOMOD_EnsembleModeling.R
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@
##' # do.bivariate = TRUE)
##'
##'
##' @importFrom foreach foreach %do% %dopar%
##' @importFrom terra rast
##'
##'
Expand Down
7 changes: 4 additions & 3 deletions R/BIOMOD_FormatingData.R
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,10 @@
##'
##' A \code{\link{BIOMOD.formated.data}} object that can be used to build species distribution
##' model(s) with the \code{\link{BIOMOD_Modeling}} function. \cr
##' \href{BIOMOD.formated.data.html}{\code{print/show}}, \href{plot.html}{\code{plot}} and
##' \href{summary.html}{\code{summary}} functions are available to have a summary of the
##' created object.
##' \href{https://biomodhub.github.io/biomod2/reference/BIOMOD.formated.data.html}{\code{print/show}},
##' \href{https://biomodhub.github.io/biomod2/reference/plot.html}{\code{plot}} and
##' \href{https://biomodhub.github.io/biomod2/reference/summary.html}{\code{summary}} functions
##' are available to have a summary of the created object.
##'
##'
##' @details
Expand Down
2 changes: 2 additions & 0 deletions R/BIOMOD_Modeling.R
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@
##' # do.bivariate = TRUE)
##'
##'
##' @importFrom foreach foreach %do%
##'
##' @export
##'
##'
Expand Down
1 change: 0 additions & 1 deletion R/BIOMOD_Projection.R
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@
##'
##'
##' @importFrom foreach foreach %dopar%
## @importFrom doParallel registerDoParallel
##' @importFrom terra rast subset nlyr writeRaster terraOptions wrap unwrap
##' mem_info app is.factor mask
##' @importFrom utils capture.output
Expand Down
1 change: 1 addition & 0 deletions R/BIOMOD_RangeSize.R
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
##' bm_PlotRangeSize(bm.range = myBiomodRangeSize)
##'
##'
##' @importFrom foreach foreach %do%
##' @importFrom terra rast nlyr `add<-` values
##'
##' @export
Expand Down
3 changes: 0 additions & 3 deletions R/biomod2_classes_5.R
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ setMethod('show', signature('biomod2_ensemble_model'),
##' \code{boolean} describing whether \code{newdata} is given as raw environmental
##' data (\code{FALSE}) or as formal predictions of the individual models
##' used to build the ensemble model (\code{TRUE}).
##' @param na.rm (\emph{optional, default} \code{TRUE}) \cr
##' A boolean defining whether Ensemble Model projection should ignore \code{NA}
##' in Individual Model projection. Argument ignored by EWmean ensemble algorithm.
##'
##' @param \ldots (\emph{optional})
##' @inheritParams predict2.bm
Expand Down
3 changes: 3 additions & 0 deletions R/biomod2_globalVariables.R
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ utils::globalVariables(names = c("i.abs"))
## bm_Tuning ------------
utils::globalVariables(names = c("dataset.i", "PA.i", "tuned.mod", "train.params", "tuning.grid", "criteria.AIC"))

## bm_ModelingOptions ------------
utils::globalVariables(names = c("ModelsTable"))

## bm_CrossValidation ------------
utils::globalVariables(names = c("pa", "env", "this.colnames"))

Expand Down
2 changes: 2 additions & 0 deletions R/bm_CrossValidation.R
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@
##' apply(cv.e, 2, table)
##'
##'
##' @importFrom foreach foreach %do%
##'
##' @export
##'
##'
Expand Down
2 changes: 1 addition & 1 deletion R/bm_PlotResponseCurves.R
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
##'
##'
##' @importFrom terra rast cats global is.factor nlyr
##' @importFrom foreach foreach %:%
##' @importFrom foreach foreach %do% %:%
##' @importFrom reshape2 melt
##' @importFrom ggplot2 ggplot aes_string geom_line geom_rug geom_raster facet_wrap xlab ylab labs
##' theme element_blank element_rect element_text scale_fill_viridis_c
Expand Down
1 change: 1 addition & 0 deletions R/bm_PseudoAbsences.R
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
##' apply(PA.r_mult$pa.tab, 2, table)
##'
##'
##' @importFrom foreach foreach %do%
##' @importFrom terra rast vect freq spatSample values extract
##' @importFrom utils packageVersion
##'
Expand Down
2 changes: 1 addition & 1 deletion R/bm_RunModelsLoop.R
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
##' @family Secundary functions
##'
##'
##' @importFrom foreach foreach %dopar%
##' @importFrom foreach foreach %do% %dopar%
##' @importFrom rpart prune
##' @importFrom gbm gbm.perf
##' @importFrom dplyr mutate_at %>%
Expand Down
2 changes: 1 addition & 1 deletion R/bm_Tuning.R
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
##'
##'
##'
##' @importFrom foreach foreach %do%
##' @importFrom foreach foreach %do% %:%
##' @importFrom stats aggregate
##' @importFrom PresenceAbsence optimal.thresholds presence.absence.accuracy
##'
Expand Down
12 changes: 1 addition & 11 deletions R/bm_VariablesImportance.R
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@
##' nb.rep = 3)
##'
##'
##' @importFrom foreach foreach %:% %dopar%
## @importFrom doParallel registerDoParallel
##' @importFrom foreach foreach %do% %:%
##' @importFrom stats cor
##'
##'
Expand All @@ -99,7 +98,6 @@ bm_VariablesImportance <- function(bm.model,
variables = NULL,
method = "full_rand",
nb.rep = 1,
# nb.cpu = 1,
seed.val = NULL,
do.progress = TRUE,
temp.workdir = NULL)
Expand All @@ -122,14 +120,6 @@ bm_VariablesImportance <- function(bm.model,
PROGRESS = txtProgressBar(min = 0, max = nb.rep * length(variables), style = 3)
i.iter = 0
}
# if (nb.cpu > 1) {
# if (.getOS() != "windows") {
# if (!isNamespaceLoaded("doParallel")) { requireNamespace("doParallel", quietly = TRUE) }
# doParallel::registerDoParallel(cores = nb.cpu)
# } else {
# warning("Parallelisation with `foreach` is not available for Windows. Sorry.")
# }
# }
out = foreach (r = 1:nb.rep, .combine = "rbind") %:%
foreach (v = variables, .combine = "rbind") %do%
{
Expand Down
7 changes: 4 additions & 3 deletions docs/reference/BIOMOD_FormatingData.html

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

3 changes: 1 addition & 2 deletions docs/reference/OptionsBigboss.html

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

22 changes: 11 additions & 11 deletions docs/reference/bm_Tuning.html

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

16 changes: 8 additions & 8 deletions docs/reference/predict2.em.html

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

Loading

0 comments on commit 20e9784

Please sign in to comment.