Skip to content

Commit 6e844ff

Browse files
Pre-release tidying
1 parent 70e9529 commit 6e844ff

15 files changed

+98
-51
lines changed

.Rbuildignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@
1414
^data-raw$
1515
^vignettes/articles$
1616
^CRAN-SUBMISSION$
17+
^revdep$

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Config/testthat/parallel: true
5656
Encoding: UTF-8
5757
LazyData: true
5858
Roxygen: list(markdown = TRUE)
59-
RoxygenNote: 7.2.2
59+
RoxygenNote: 7.2.3
6060
LinkingTo:
6161
cpp11
6262
SystemRequirements: C++11

NEWS.md

+18-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
11
# spatialsample (development version)
22

3-
* Outputs from `spatial_buffer_vfold_cv()` should now have the correct `radius` and `buffer` attributes (#110).
3+
## Breaking changes
4+
5+
* `spatial_clustering_cv()` no longer accepts non-sf objects. Use
6+
`rsample::clustering_cv()` for these instead (#126).
7+
8+
* `spatial_clustering_cv()` now uses edge-to-edge distances, like the rest of
9+
the package, rather than centroids (#126).
10+
11+
## New features
412

513
* All functions now have a `repeats` argument, defaulting to 1, allowing for
6-
repeated cross-validation.
14+
repeated cross-validation (#122, #125, #126).
15+
16+
* `spatial_clustering_cv()` now has a `distance_function` argument, set by
17+
default to `as.dist(sf::st_distance(x))` (#126).
18+
19+
## Minor improvements and fixes
20+
21+
* Outputs from `spatial_buffer_vfold_cv()` should now have the correct `radius` and `buffer` attributes (#110).
722

823
* `spatial_buffer_vfold_cv()` now has the correct `id` values when using repeats (#116).
924

1025
* `spatial_buffer_vfold_cv()` now throws an error when `repeats > 1 && v >= nrow(data)` (#116).
1126

1227
* The minimum `sf` version required is now `>= 1.0-9`, so that unit objects can be passed to `cellsize` in `spatial_block_cv()` (#113; #124).
1328

14-
* `autoplot()` now handles repeated cross-validation properly.
15-
16-
* `spatial_clustering_cv()` no longer accepts non-sf objects. Use
17-
`rsample::clustering_cv()` for these instead.
18-
19-
* `spatial_clustering_cv()` now uses edge-to-edge distances, like the rest of
20-
the package, rather than centroids.
21-
22-
* `spatial_clustering_cv()` now has a `distance_function` argument, set by
23-
default to `as.dist(sf::st_distance(x))`.
29+
* `autoplot()` now handles repeated cross-validation properly (#123).
2430

2531
# spatialsample 0.2.1
2632

R/data.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#' \item{geometry}{Geometry of each hexagon, encoded using EPSG:2249 as a coordinate reference system (NAD83 / Massachusetts Mainland (ftUS)). Note that the linear units of this CRS are in US feet.}
4444
#' }
4545
#'
46-
#' @source Canopy data is from \url{https://data.boston.gov/dataset/hex-tree-canopy-change-metrics2}.
47-
#' Heat data is from \url{https://data.boston.gov/dataset/hex-mean-heat-index2}.
46+
#' @source Canopy data is from \url{https://data.boston.gov/dataset/hex-tree-canopy-change-metrics}.
47+
#' Heat data is from \url{https://data.boston.gov/dataset/hex-mean-heat-index}.
4848
#' Most field definitions are from \url{https://data.boston.gov/dataset/canopy-change-assessment-data-dictionary}.
4949
"boston_canopy"

README.md

+23-23
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ The goal of spatialsample is to provide functions and classes for
2020
spatial resampling to use with
2121
[rsample](https://rsample.tidymodels.org/), including:
2222

23-
- [spatial clustering
24-
cross-validation](https://doi.org/10.1109/IGARSS.2012.6352393)
25-
- [spatial block cross-validation](https://doi.org/10.1111/ecog.02881)
26-
- [spatially buffered
27-
cross-validation](https://doi.org/10.1111/geb.12161)
28-
- [leave-location-out
29-
cross-validation](https://doi.org/10.1016/j.envsoft.2017.12.001)
23+
- [spatial clustering
24+
cross-validation](https://doi.org/10.1109/IGARSS.2012.6352393)
25+
- [spatial block cross-validation](https://doi.org/10.1111/ecog.02881)
26+
- [spatially buffered
27+
cross-validation](https://doi.org/10.1111/geb.12161)
28+
- [leave-location-out
29+
cross-validation](https://doi.org/10.1016/j.envsoft.2017.12.001)
3030

3131
Like [rsample](https://rsample.tidymodels.org/), spatialsample provides
3232
building blocks for creating and analyzing resamples of a spatial data
@@ -67,11 +67,11 @@ folds
6767
#> # A tibble: 5 × 2
6868
#> splits id
6969
#> <list> <chr>
70-
#> 1 <split [600/82]> Fold1
71-
#> 2 <split [589/93]> Fold2
70+
#> 1 <split [604/78]> Fold1
71+
#> 2 <split [595/87]> Fold2
7272
#> 3 <split [524/158]> Fold3
73-
#> 4 <split [497/185]> Fold4
74-
#> 5 <split [518/164]> Fold5
73+
#> 4 <split [490/192]> Fold4
74+
#> 5 <split [515/167]> Fold5
7575
```
7676

7777
In this example, the `boston_canopy` data on tree cover in Boston, MA is
@@ -109,18 +109,18 @@ This project is released with a [Contributor Code of
109109
Conduct](https://contributor-covenant.org/version/2/1/CODE_OF_CONDUCT.html).
110110
By contributing to this project, you agree to abide by its terms.
111111

112-
- For questions and discussions about tidymodels packages, modeling,
113-
and machine learning, please [post on RStudio
114-
Community](https://community.rstudio.com/new-topic?category_id=15&tags=tidymodels,question).
112+
- For questions and discussions about tidymodels packages, modeling, and
113+
machine learning, please [post on RStudio
114+
Community](https://community.rstudio.com/new-topic?category_id=15&tags=tidymodels,question).
115115

116-
- If you think you have encountered a bug, please [submit an
117-
issue](https://github.com/tidymodels/rules/issues).
116+
- If you think you have encountered a bug, please [submit an
117+
issue](https://github.com/tidymodels/rules/issues).
118118

119-
- Either way, learn how to create and share a
120-
[reprex](https://reprex.tidyverse.org/articles/articles/learn-reprex.html)
121-
(a minimal, reproducible example), to clearly communicate about your
122-
code.
119+
- Either way, learn how to create and share a
120+
[reprex](https://reprex.tidyverse.org/articles/articles/learn-reprex.html)
121+
(a minimal, reproducible example), to clearly communicate about your
122+
code.
123123

124-
- Check out further details on [contributing guidelines for tidymodels
125-
packages](https://www.tidymodels.org/contribute/) and [how to get
126-
help](https://www.tidymodels.org/help/).
124+
- Check out further details on [contributing guidelines for tidymodels
125+
packages](https://www.tidymodels.org/contribute/) and [how to get
126+
help](https://www.tidymodels.org/help/).

cran-comments.md

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## Release Summary
22

3-
This is the 3rd CRAN release of spatialsample. This release patches some functionality to keep spatialsample aligned with changes in rsample, and now supports simulated data and spatial data without a coordinate reference system.
3+
This is the 4th CRAN release of spatialsample. This release adds support for repeated cross-validation across all functions, uses edge-to-edge distance for spatially clustered cross-validation, and fixes a few minor bugs.
44

55
## R CMD check results
66

77
0 errors | 0 warnings | 1 notes
88

9-
> checking CRAN incoming feasibility ... NOTE
10-
Maintainer: ‘Michael Mahoney <mike.mahoney.218@gmail.com>
11-
12-
New maintainer:
13-
Michael Mahoney <mike.mahoney.218@gmail.com>
14-
Old maintainer(s):
15-
Julia Silge <julia.silge@rstudio.com>
16-
17-
Michael will be taking over as package maintainer as Julia (who remains as a package author) starts to focus more on the vetiver package and related projects. You'll receive an email confirming this from Julia shortly.
18-
199
> Found the following (possibly) invalid URLs:
2010
URL: https://doi.org/10.1111/geb.12161
2111
From: README.md

man/boston_canopy.Rd

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-14.1 KB
Loading
-15.1 KB
Loading

revdep/.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
checks
2+
library
3+
checks.noindex
4+
library.noindex
5+
cloud.noindex
6+
data.sqlite
7+
*.html

revdep/README.md

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Platform
2+
3+
|field |value |
4+
|:--------|:---------------------------------------------------------------|
5+
|version |R version 4.2.2 Patched (2022-11-10 r83330) |
6+
|os |Ubuntu 22.04.1 LTS |
7+
|system |x86_64, linux-gnu |
8+
|ui |RStudio |
9+
|language |(EN) |
10+
|collate |en_US.UTF-8 |
11+
|ctype |en_US.UTF-8 |
12+
|tz |America/New_York |
13+
|date |2022-12-09 |
14+
|rstudio |2022.07.2+576 Spotted Wakerobin (desktop) |
15+
|pandoc |2.19.2 @ /usr/lib/rstudio/bin/quarto/bin/tools/ (via rmarkdown) |
16+
17+
# Dependencies
18+
19+
|package |old |new |Δ |
20+
|:-------------|:-----|:----------|:--|
21+
|spatialsample |0.2.1 |0.2.1.9000 |* |
22+
|globals |NA |0.16.2 |* |
23+
|rsample |NA |1.1.1 |* |
24+
|s2 |NA |1.1.1 |* |
25+
|slider |NA |0.3.0 |* |
26+
|vctrs |NA |0.5.1 |* |
27+
28+
# Revdeps
29+

revdep/cran.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## revdepcheck results
2+
3+
We checked 1 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
4+
5+
* We saw 0 new problems
6+
* We failed to check 0 packages
7+

revdep/email.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
release_date: ???
2+
rel_release_date: ???
3+
my_news_url: ???
4+
release_version: ???
5+
release_details: ???

revdep/failures.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*Wow, no problems at all. :)*

revdep/problems.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*Wow, no problems at all. :)*

0 commit comments

Comments
 (0)