Skip to content

Commit

Permalink
doc updates (#17)
Browse files Browse the repository at this point in the history
* fix CRAN NOTEs
* fix package overview manual entry (fix #15)
  • Loading branch information
jeffreyhanson authored Jan 26, 2024
1 parent 059a1ab commit 44721db
Show file tree
Hide file tree
Showing 100 changed files with 389 additions and 337 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: raptr
Type: Package
Title: Representative and Adequate Prioritization Toolkit in R
Version: 1.0.0
Version: 1.0.1
Authors@R: c(person(c("Jeffrey", "O"), "Hanson",
email="[email protected]", role = c("aut", "cre")),
person(c("Jonathan", "R"), "Rhodes", role = c("aut")),
Expand Down Expand Up @@ -90,6 +90,6 @@ Collate:
'sim.species.R'
'urap.proportion.held.R'
'zzz.R'
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
NeedsCompilation: yes
Roxygen: list(markdown = TRUE)
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# raptr 1.0.1

- Fix usage sections in documentation.
- Fix missing braces in documentation.
- Fix aliasing for package manual entry (#15).

# raptr 1.0.0

- The package has been overhauled to support modern spatial data structures.
Expand Down
4 changes: 2 additions & 2 deletions R/generics.R
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ amount.held <- function(x, y, species) UseMethod("amount.held")
#'
#' @param value `numeric` new target.
#'
#' @return code{numeric} vector.
#' @return `numeric` vector.
#'
#' @seealso [RapData()], [RapResults()],
#' [RapSolved()].
Expand Down Expand Up @@ -769,7 +769,7 @@ amount.target <- function(x, species) UseMethod("amount.target")
#' @param space `NULL` for all spaces or `integer` indicating a
#' specific space.
#'
#' @return code{matrix} object.
#' @return `matrix` object.
#'
#' @seealso [RapResults()], [RapSolved()].
#'
Expand Down
1 change: 1 addition & 0 deletions R/package.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ NULL
#' **9**: 320--330. DOI: 10.1111/2041-210X.12862.
#'
#' @docType package
#' @aliases raptr-package
#' @name raptr
NULL

Expand Down
4 changes: 4 additions & 0 deletions R/raptr-internal.R
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,8 @@ basemap <- function(x, basemap = "hybrid", grayscale = FALSE,
#' @keywords internal
#'
#' @name is.cached
#'
#' @aliases is.cached,RapData,character-method is.cached,RapResults,character-method
methods::setGeneric("is.cached",
function(x, name) methods::standardGeneric("is.cached"))

Expand All @@ -482,6 +484,8 @@ methods::setGeneric("is.cached",
#' @keywords internal
#'
#' @name cache
#'
#' @aliases cache,RapData,character,ANY-method cache,RapData,character,missing-method cache,RapResults,character,ANY-method cache,RapResults,character,missing-method
methods::setGeneric("cache",
function(x, name, y) methods::standardGeneric("cache"))

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ vignette("raptr", package = "raptr")
citation("raptr")
```

##
## To cite the raptr package in publications, use:
##
## Hanson JO, Rhodes JR, Possingham HP & Fuller RA (2018) raptr:
Expand Down
8 changes: 2 additions & 6 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Dear CRAN volunteers,

Thank you very much for reviewing this submission.

This submission contains an update for the raptr package that is currently available on CRAN. It aims to address several of the NOTES and the ERROR detected by CRAN's automated checks on the CRAN's Fedora-clang platform (i.e., `r-devel-linux-x86_64-fedora-clang`). Specifically, it has updates that (i) replace dependencies for the rgdal and rgeos packages in anticipation of their retirement, (ii) fix package startup message issues, (iii) fix the CITATION file format, and (iv) removes the C++ specification because it is compatible with C++14 (following advice on R-pkg-devel emailing list, <https://stat.ethz.ch/pipermail/r-package-devel/2023q1/008870.html>). Additionally, it has updated examples and unit tests to address failing checks on CRAN's Fedora-clang platform.

In case it is helpful, I will explain the steps and rationale taken to address the failing checks on CRAN's Fedora-clang platform. Although I have attempted to reproduce the failed check on a comparable platform (i.e., the R-hub Fedora Clang docker image, <https://hub.docker.com/r/rhub/fedora-clang-devel>) and other platforms (see test environments below), I am unable to reproduce the specific error detected on CRAN's Fedora-clang platform. As such, I have (i) encapsulated all examples within `dontrun{}` and (ii) ensured that unit tests are not run on Fedora platforms. This approach ensures that the examples and unit tests will not throw an error on CRAN's Fedora-clang platform. This approach also ensures that all unit tests are still run on other platforms (e.g., Windows, Debian, macOS). It is also worth noting that I cannot simply encapsulate the failing example and unit test detected on CRAN's Fedora-clang platform, because I cannot guarantee that there are not other examples that fail on this platform (since I cannot reproduce the error). Although this approach is not ideal, I believe that the CRAN volunteers' time is the most precious resource and this approach is the only way that I can think of that would avoid wasting their time with the possibility of multiple submissions. I hope that my explanation and approach is satisfactory.
Thank you for reviewing this submission. This submission contains updates for the raptr package. Specifically, these updates include documentation fixes to address the NOTEs on CRAN's checks and the aliasing for the package overview help file.

Cheers,

Expand All @@ -22,7 +18,7 @@ Jeff

# R CMD check results

0 errors | 0 warnings | 3 notes
0 errors | 0 warnings | 2 notes

# Notes

Expand Down
2 changes: 1 addition & 1 deletion docs/404.html

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

2 changes: 1 addition & 1 deletion docs/articles/index.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/raptr.html

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

Binary file modified docs/articles/raptr_files/figure-html/unnamed-chunk-58-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/raptr_files/figure-html/unnamed-chunk-62-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/raptr_files/figure-html/unnamed-chunk-63-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/raptr_files/figure-html/unnamed-chunk-64-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/raptr_files/figure-html/unnamed-chunk-66-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/raptr_files/figure-html/unnamed-chunk-7-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/authors.html

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

43 changes: 21 additions & 22 deletions docs/index.html

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

10 changes: 8 additions & 2 deletions docs/news/index.html

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

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pkgdown: 2.0.7
pkgdown_sha: ~
articles:
raptr: raptr.html
last_built: 2023-03-14T03:26Z
last_built: 2024-01-26T00:56Z
urls:
reference: https://jeffrey-hanson.com/raptr/reference
article: https://jeffrey-hanson.com/raptr/articles
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/AttributeSpace-class.html

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

2 changes: 1 addition & 1 deletion docs/reference/AttributeSpace.html

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

2 changes: 1 addition & 1 deletion docs/reference/AttributeSpaces-class.html

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

2 changes: 1 addition & 1 deletion docs/reference/AttributeSpaces.html

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

2 changes: 1 addition & 1 deletion docs/reference/DemandPoints-class.html

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

Loading

0 comments on commit 44721db

Please sign in to comment.