Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates [v2024.02.23] #415

Merged
merged 49 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
caac135
fixed error reported by JK; changed m to km
bjohnso005 Apr 6, 2023
db563c7
edited hyperlinks to open in new window; fixed broken links; correcte…
bjohnso005 Apr 7, 2023
0c47e36
add try() to test file
bjohnso005 Apr 14, 2023
d218ecf
[2.0.5] try(), m to km, fixed gt ref links
bjohnso005 Apr 14, 2023
50dfb38
added skip_if()
bjohnso005 Apr 14, 2023
456d003
Merge pull request #400 from bjohnso005/master
gepinillab Apr 15, 2023
51a3ebe
[v2.0.5] + doc & citation URL
gepinillab Apr 15, 2023
18cfac0
[v2.0.6] paleo occs removed (`paleobioDB` package currently off CRAN
bjohnso005 Sep 1, 2023
8b141d5
Merge pull request #403 from bjohnso005/paleoDEV
gepinillab Sep 1, 2023
3a23894
Merge branch 'master' of https://github.com/wallaceEcoMod/wallace
gepinillab Sep 1, 2023
a9a4f50
changed GEPB email
gepinillab Sep 1, 2023
584d0c1
removed rgdal
bjohnso005 Sep 5, 2023
dbf11a8
Merge branch 'master' into rgdalDEV
gepinillab Sep 5, 2023
7ae5469
Update DESCRIPTION
gepinillab Sep 5, 2023
eaf34fd
Merge pull request #404 from bjohnso005/rgdalDEV
gepinillab Sep 5, 2023
24e2da2
update date 2.0.6
gepinillab Sep 5, 2023
268aea7
removed `rgeos::gBuffer`
bjohnso005 Sep 14, 2023
8fd1c98
removed rgeos::gIntersects()
bjohnso005 Sep 20, 2023
a5fde9f
removed typo
bjohnso005 Sep 20, 2023
0ffd167
update Team bios
bjohnso005 Sep 21, 2023
2214bac
fixed buffer tests
bjohnso005 Sep 21, 2023
6eee588
removed typo
bjohnso005 Sep 25, 2023
278eb60
clarification to guidance text
bjohnso005 Sep 25, 2023
f38761b
[v2.1.0] removed rgeos, updated team bios, fixed typos & gt
bjohnso005 Sep 25, 2023
2f5170b
added error msgs to xfer_time
bjohnso005 Sep 25, 2023
662452f
[v2.1.0] removed rgeos, updated team bios, fixed typos & gt
bjohnso005 Sep 25, 2023
299ec0a
Merge pull request #405 from bjohnso005/rgeosDEV
gepinillab Sep 25, 2023
17b0a4b
small fix and doc
gepinillab Sep 25, 2023
7070bf6
updated webinars on About pg
bjohnso005 Oct 25, 2023
ef961c9
added BAJ as developer
bjohnso005 Oct 25, 2023
bbd4b2c
updated webinars on About pg
bjohnso005 Oct 26, 2023
03cba59
added license
bjohnso005 Oct 27, 2023
8be62dd
temp fix for Occ Density module (`ecospat.plot.niche()` bug fix)
bjohnso005 Nov 1, 2023
ff97f24
change maintainer from GEPB to MB
bjohnso005 Dec 5, 2023
9e08e2c
[v2.1.1] ecospat bug fix, add license, update maintainer
bjohnso005 Dec 5, 2023
22ed5d6
Merge pull request #410 from bjohnso005/BAJdev
bjohnso005 Dec 5, 2023
65039a1
Add license text to .R files
danflop Dec 6, 2023
2d1d616
Merge pull request #411 from danflop/licenseText
bjohnso005 Dec 6, 2023
af43dc5
Update ecospat version in description file and delete unused file
danflop Dec 7, 2023
2bf3421
Fix license text
danflop Dec 7, 2023
1327e1f
Merge pull request #412 from danflop/licenseText
bjohnso005 Dec 7, 2023
724fd8d
merging v2.1.1 into biomodelos branch
bjohnso005 Dec 14, 2023
0565929
`rgdal::readOGR()` and `rgdal::writeOGR()` removed
bjohnso005 Feb 16, 2024
9fb83e2
removed `rgeos::gBuffer()`
bjohnso005 Feb 16, 2024
1a1c0e2
removed rgeos::gIntersects()
bjohnso005 Feb 22, 2024
4376073
removed `rgeos::gUnaryUnion()`
bjohnso005 Feb 23, 2024
df646d6
v2024.02.23
bjohnso005 Feb 23, 2024
1d6ac20
added Beth G. to team
bjohnso005 Feb 26, 2024
2790446
add error msg for prediction
bjohnso005 Mar 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ cmip5* # worldclim files
^_pkgdown\.yml$
^docs$
^pkgdown$
^LICENSE$
26 changes: 13 additions & 13 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: wallace
Version: 2023.03.16
Date: 2023-03-16
Version: 2024.02.23
Date: 2024-02-23
Title: A Modular Platform for Reproducible Modeling of Species Niches
and Distributions
Description: The 'shiny' application Wallace is a modular platform for
Expand All @@ -13,14 +13,14 @@ Description: The 'shiny' application Wallace is a modular platform for
website: <https://wallaceecomod.github.io/wallace/articles/tutorial-v2.html>.
Authors@R:
c(person("Jamie M.", "Kass", email = "[email protected]", role = "aut"),
person("Gonzalo E.", "Pinilla-Buitrago", email = "[email protected]", role = c("aut", "cre")),
person("Gonzalo E.", "Pinilla-Buitrago", email = "[email protected]", role = "aut"),
person("Andrea", "Paz", email = "[email protected]", role = "aut"),
person("Bethany A.", "Johnson", email = "[email protected]", role = "aut"),
person("Valentina", "Grisales-Betancur", email = "[email protected]", role = "aut"),
person("Dean", "Attali", email = "[email protected]", role = "aut"),
person("Matthew E.", "Aiello-Lammens", email = "[email protected]", role = "aut"),
person("Cory", "Merow", email = "[email protected]", role = "aut"),
person("Mary E.", "Blair", email = "[email protected]", role = "aut"),
person("Mary E.", "Blair", email = "[email protected]", role = c("aut", "cre")),
person("Robert P.", "Anderson", email = "[email protected]", role = "aut"),
person("Sarah I.", "Meenan", email = "[email protected]", role = "ctb"),
person("Olivier", "Broennimann", email = "[email protected]", role = "ctb"),
Expand All @@ -35,22 +35,26 @@ Depends:
shiny (>= 1.6.0),
leaflet (>= 2.0.2)
Imports:
dplyr (>= 1.0.2),
changeRangeR,
dplyr (>= 1.0.2),
DT (>= 0.5),
ecospat,
ecospat (>= 4.0.0),
ENMeval (>= 2.0.3),
knitcitations,
leafem,
leaflet.extras (>= 1.0.0),
magrittr,
maskRangeR,
RColorBrewer,
rJava,
rlang,
rmarkdown,
sf,
shinyalert,
shinyjs,
shinyWidgets (>= 0.6.0),
spocc (>= 1.2.0),
spThin,
terra (>= 1.6-7),
zip
Suggests:
Expand All @@ -60,27 +64,23 @@ Suggests:
geojsonsf,
glue,
httr,
glue,
jsonlite,
knitr,
lubridate,
mapview,
maxnet,
methods,
occCite,
paleobioDB,
rangeModelMetadata,
raster,
rgbif (>= 3.3.0),
rgdal,
rgeos,
rJava,
sf,
sp,
spThin,
spocc (>= 1.2.0),
stars,
testthat,
tidyselect
tidyselect,
tools
Remotes: cmerow/changeRangeR
License: GPL-3
URL: http://wallaceecomod.github.io/wallace/,
Expand Down
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export(clearAll)
export(create_module)
export(ecoClimate_getdata)
export(ecoClimate_select)
export(ecospat.plot.nicheDEV)
export(envs_ecoClimate)
export(envs_userEnvs)
export(envs_worldclim)
Expand Down Expand Up @@ -32,7 +33,6 @@ export(model_bioclim)
export(model_maxent)
export(mxNonzeroCoefs)
export(occs_biomodelos)
export(occs_paleoDb)
export(occs_queryDb)
export(occs_userOccs)
export(part_partitionOccs)
Expand Down
25 changes: 25 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
wallace 2.1.1
=============
- Fixed bug in occ density grid & niche overlap
- Updated licensing
- Updated developers & pkg maintainer

wallace 2.1.0
=============
- Removed `rgeos` (package expiring)
- Updated team bios
- Added clarification to occs_queryDb guidance text
- Added error msgs to xfer_time

wallace 2.0.6
=============
- Removed `paleobioDB` (package off CRAN)
- Removed `rgdal` (package expiring)
- Changed Maintainer e-mail

wallace 2.0.5
=============
- added try() to test_envs_worldclim.R
- fixed broken links in guidance texts refs
- fixed typo in thinOccs documentation

wallace 2.0.4
=============
- Added Spanish translation of vignette
Expand Down
23 changes: 23 additions & 0 deletions R/custom_modules.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# Wallace EcoMod: a flexible platform for reproducible modeling of
# species niches and distributions.
#
# custom_modules.R
# File author: Wallace EcoMod Dev Team. 2023.
# --------------------------------------------------------------------------
# This file is part of the Wallace EcoMod application
# (hereafter “Wallace”).
#
# Wallace is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License,
# or (at your option) any later version.
#
# Wallace is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Wallace. If not, see <http://www.gnu.org/licenses/>.
# --------------------------------------------------------------------------
#
#' Register a Wallace module
#'
#' Before running the Wallace application with \code{run_wallace()}, you can
Expand Down
25 changes: 24 additions & 1 deletion R/envs_ecoClimate.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# Wallace EcoMod: a flexible platform for reproducible modeling of
# species niches and distributions.
#
# envs_ecoClimate.R
# File author: Wallace EcoMod Dev Team. 2023.
# --------------------------------------------------------------------------
# This file is part of the Wallace EcoMod application
# (hereafter “Wallace”).
#
# Wallace is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License,
# or (at your option) any later version.
#
# Wallace is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Wallace. If not, see <http://www.gnu.org/licenses/>.
# --------------------------------------------------------------------------
#

#' @title envs_ecoClimate Obtain ecoClimate variables
#' @description download ecoClimate variables. See www.ecoclimate.org.
Expand Down Expand Up @@ -32,7 +55,7 @@
#'
#' @author Sara Varela <sara_varela@@yahoo.com>
#' @author Jamie M. Kass <jamie.m.kass@@gmail.com>
#' @author Gonzalo E. Pinilla-Buitrago <gpinillabuitrago@@gradcenter.cuny.edu>
#' @author Gonzalo E. Pinilla-Buitrago <gepinillab@@gmail.com>
#'
#' @export
#'
Expand Down
25 changes: 24 additions & 1 deletion R/envs_userEnvs.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# Wallace EcoMod: a flexible platform for reproducible modeling of
# species niches and distributions.
#
# envs_userEnvs.R
# File author: Wallace EcoMod Dev Team. 2023.
# --------------------------------------------------------------------------
# This file is part of the Wallace EcoMod application
# (hereafter “Wallace”).
#
# Wallace is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License,
# or (at your option) any later version.
#
# Wallace is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Wallace. If not, see <http://www.gnu.org/licenses/>.
# --------------------------------------------------------------------------
#
#'
#' @title envs_userEnvs
#' @description Load user provided rasters
Expand Down Expand Up @@ -30,7 +53,7 @@
#' provided rasters
#'
#' @author Jamie Kass <jamie.m.kass@@gmail.com >
#' @author Gonzalo E. Pinilla-Buitrago <gpinillabuitrago@@gradcenter.cuny.edu>
#' @author Gonzalo E. Pinilla-Buitrago <gepinillab@@gmail.com>
#' @export
#'
#'
Expand Down
25 changes: 24 additions & 1 deletion R/envs_worldclim.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# Wallace EcoMod: a flexible platform for reproducible modeling of
# species niches and distributions.
#
# envs_worldclim.R
# File author: Wallace EcoMod Dev Team. 2023.
# --------------------------------------------------------------------------
# This file is part of the Wallace EcoMod application
# (hereafter “Wallace”).
#
# Wallace is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License,
# or (at your option) any later version.
#
# Wallace is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Wallace. If not, see <http://www.gnu.org/licenses/>.
# --------------------------------------------------------------------------
#
#' @title envs_worldclim Obtain WorldClim variables
#' @description download WorldClim variables. See www.worldclim.com.
#'
Expand Down Expand Up @@ -29,7 +52,7 @@
#' worldclim rasters at the requested resolution.
#'
#' @author Jamie Kass <jamie.m.kass@@gmail.com>
#' @author Gonzalo E. Pinilla-Buitrago <gpinillabuitrago@@gradcenter.cuny.edu>
#' @author Gonzalo E. Pinilla-Buitrago <gepinillab@@gmail.com>
#'
#' @seealso \code{\link[raster]{getData}}
#'
Expand Down
29 changes: 26 additions & 3 deletions R/espace_nicheOv.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# Wallace EcoMod: a flexible platform for reproducible modeling of
# species niches and distributions.
#
# espace_nicheOv.R
# File author: Wallace EcoMod Dev Team. 2023.
# --------------------------------------------------------------------------
# This file is part of the Wallace EcoMod application
# (hereafter “Wallace”).
#
# Wallace is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License,
# or (at your option) any later version.
#
# Wallace is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Wallace. If not, see <http://www.gnu.org/licenses/>.
# --------------------------------------------------------------------------
#
#' @title espace_nicheOv Niche Overlap
#' @description Function evaluates niche overlap between the two species for
#' which the occurrence density grid was computed
Expand Down Expand Up @@ -54,7 +77,7 @@
#' }
#'
#' @return A list of 4 elements if all is set to TRUE. Elements are overlap
#' (Schoener's D), USE (ecopstat.niche.dyn.index), equiv and simil.
#' (Schoener's D), USE (ecospat.niche.dyn.index), equiv and simil.
#' @author Jamie Kass <jamie.m.kass@@gmail.com>
#' @author Olivier Broennimann <olivier.broennimann@@unil.ch>
#' @seealso \code{\link{espace_pca}} \code{\link{espace_occDens}}
Expand All @@ -80,15 +103,15 @@ espace_nicheOv <- function(z1, z2, iter = 100, equivalency = FALSE,
if (equivalency == TRUE) {
smartProgress(logger, message = "Calculating niche equivalency...", {
nicheOv$equiv <- ecospat::ecospat.niche.equivalency.test(
z1, z2, iter, overlap.alternative = "higher"
z1, z2, rep = 100, overlap.alternative = "higher"
)
})
}

if (similarity == TRUE) {
smartProgress(logger, message = "Calculating niche similarity", {
nicheOv$simil <- ecospat::ecospat.niche.similarity.test(
z1, z2, iter, overlap.alternative = "higher", rand.type = 1
z1, z2, rep = 100, overlap.alternative = "higher", rand.type = 1
)
})
}
Expand Down
25 changes: 24 additions & 1 deletion R/espace_occDens.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# Wallace EcoMod: a flexible platform for reproducible modeling of
# species niches and distributions.
#
# espace_occDens.R
# File author: Wallace EcoMod Dev Team. 2023.
# --------------------------------------------------------------------------
# This file is part of the Wallace EcoMod application
# (hereafter “Wallace”).
#
# Wallace is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License,
# or (at your option) any later version.
#
# Wallace is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Wallace. If not, see <http://www.gnu.org/licenses/>.
# --------------------------------------------------------------------------
#

#' @title Occurrence density grid
#' @description calculates the part of environmental space more densely
Expand Down Expand Up @@ -48,7 +71,7 @@
#' }
#'
#' @return Returns a list of 2 lists (one for each species). Each list is an
#' ecospat noche object that contains 10 species specific slots with
#' ecospat niche object that contains 10 species specific slots with
#' information outputed by ecospat::grid.clim.dyn. z.uncor is the density of
#' occurrence of the species and z.cor the occupancy of the environment by
#' the species. It has the input parameters as individual slots.
Expand Down
23 changes: 23 additions & 0 deletions R/espace_pca.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# Wallace EcoMod: a flexible platform for reproducible modeling of
# species niches and distributions.
#
# espace_pca.R
# File author: Wallace EcoMod Dev Team. 2023.
# --------------------------------------------------------------------------
# This file is part of the Wallace EcoMod application
# (hereafter “Wallace”).
#
# Wallace is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License,
# or (at your option) any later version.
#
# Wallace is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Wallace. If not, see <http://www.gnu.org/licenses/>.
# --------------------------------------------------------------------------
#
#' @title espace_pca Principal component analysis
#' @description Principal component analysis to reduce dimensionality of
#' environmental space
Expand Down
Loading
Loading