-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
27 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,9 @@ | ||
| Package: apcf | ||
| Title: Adapted Pair Correlation Function | ||
| Version: 0.2.0.902 | ||
| Version: 0.3.0 | ||
| Authors@R: | ||
| person(given="Robert", | ||
| family="Nuske", | ||
| role=c("aut", "cre"), | ||
| email="[email protected]", | ||
| person(given="Robert", family="Nuske", role=c("aut", "cre"), | ||
| email="[email protected]", | ||
| comment=c(ORCID="0000-0001-9773-2061")) | ||
| Description: The adapted pair correlation function transfers the concept of the | ||
| pair correlation function from point patterns to patterns of objects of | ||
|
|
@@ -18,18 +16,12 @@ License: GPL (>= 3) | |
| URL: https://rnuske.github.io/apcf/, https://github.com/rnuske/apcf | ||
| BugReports: https://github.com/rnuske/apcf/issues | ||
| Encoding: UTF-8 | ||
| Depends: | ||
| R (>= 3.3.0) | ||
| Imports: | ||
| Rcpp (>= 0.12), | ||
| wk (>= 0.6.0) | ||
| Suggests: | ||
| knitr, | ||
| rmarkdown | ||
| LinkingTo: | ||
| Rcpp | ||
| Depends: R (>= 3.3.0) | ||
| Imports: Rcpp (>= 0.12), wk (>= 0.6.0) | ||
| Suggests: knitr, rmarkdown | ||
| LinkingTo: Rcpp | ||
| SystemRequirements: C++11, GEOS (>= 3.4.0) | ||
| VignetteBuilder: knitr | ||
| LazyData: true | ||
| Roxygen: list(markdown=TRUE) | ||
| RoxygenNote: 7.1.2 | ||
| RoxygenNote: 7.2.1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,16 @@ | ||
| # ToDo | ||
|
|
||
| ## Medium term | ||
| [ ] look at parallelizing C++ part using RcppParallel | ||
| [ ] allow sf geometries instead of importing from OGR files | ||
| [ ] think about max_dist and kernel bandwidth (xlim <- max_dist - bw/2) | ||
| [ ] check imported geometries if assumptions are met | ||
| [ ] unit testing | ||
| [X] make it compile on windows | ||
| [ ] proper way of seeding RNG | ||
| (check [report](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3551.pdf) ) | ||
| - [ ] look at parallelizing C++ part using RcppParallel | ||
| - [ ] think about max_dist and kernel bandwidth (xlim <- max_dist - bw/2) | ||
| - [ ] check imported geometries. Are my assumptions met? | ||
| - [ ] unit testing | ||
|
|
||
| ## Long term | ||
| [ ] retest influence of quad_segs against very high number (sfr uses 30 as default for buffer) | ||
| [ ] think about precision in wkb/GEOS. look at [sfr](https://github.com/edzer/sfr)) | ||
| [ ] figure out if GEOSGeometries need to be destroyed (and how) in case of userInterrupt | ||
| [ ] Clean up (destroy GEOSGeometries) before throwing exception and in calling functions | ||
| [ ] shall we try to guess a sensible max_dist if none provided by user? | ||
| [ ] Think about PreparedGeometries | ||
| [ ] shall we allow disjoint study areas? | ||
| - [ ] retest influence of quad_segs against very high number ([sf](https://github.com/r-spatial/sf) uses 30 as default for buffer) | ||
| - [ ] think about precision in wkb/GEOS (cf. [sf](https://github.com/r-spatial/sf)) | ||
| - [ ] figure out if GEOSGeometries need to be destroyed (and how) in case of userInterrupt | ||
| - [ ] Clean up (destroy GEOSGeometries) before throwing exception and in calling functions | ||
| - [ ] shall we try to guess a sensible max_dist if none provided by user? | ||
| - [ ] think about PreparedGeometries | ||
| - [ ] shall we allow disjoint study areas? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,7 @@ | ||
| This submission fixes a bug that appeared on CRAN as requested by Kurt Hornik. | ||
| It also contains a major overhaul of the dependencies. GDAL is no longer needed, reducing the size of the binary package considerably. | ||
| This is a minor update that also fixes the M1mac warning reported under "Additional issues". | ||
|
|
||
| The error on CRAN was due to CXX11 not being found on systems that identified themselves as 4.3 because of a weak R version check in my configure file. This is now fixed. I checked the fix on Rhub platforms on which I previously reproduced the error. | ||
| The maintainer stays the same, but the email address changed. | ||
|
|
||
| This package checks okay locally on ubuntu 20.04 R-release, all win-builder flavors, macOS builder, Rhub's check_for_cran suite and Github Actions CI. | ||
|
|
||
| ## Test environments | ||
| * local Ubuntu 20.04, R 4.1.3 | ||
|
|
||
| * win-builder | ||
| * R version 4.0.5 (2021-03-31) | ||
| * R version 4.1.3 (2022-03-10) | ||
| * R version 4.2.0 alpha (2022-03-27 r81997 ucrt) | ||
|
|
||
| * mac-builder | ||
| * r-release-macosx-arm64|4.1.1|macosx|macOS 11.5.2 (20G95)|Mac mini|Apple M1||en_US.UTF-8 | ||
|
|
||
| * R-hub | ||
| * Ubuntu Linux 20.04.1 LTS, R-release, GCC | ||
| * Debian Linux, R-devel, GCC ASAN/UBSAN | ||
| * Fedora Linux, R-devel, clang, gfortran | ||
| * Windows Server 2022, R-devel, 64 bit | ||
|
|
||
| * Continuous Integration Systems | ||
| * Drone: Debian testing, R version 4.1.3 (2022-03-10) | ||
|
|
||
| * Github Actions | ||
| * ubuntu-20.04, R version 4.0.5 (2021-03-31) | ||
| * ubuntu-20.04, R version 4.1.3 (2022-03-10) | ||
| * ubuntu-20.04, R Under development (unstable) (2022-03-27 r81995) | ||
| * Windows Server 2022, R version 3.6.3 (2020-02-29) | ||
| * Windows Server 2022, R version 4.1.3 (2022-03-10) | ||
| * Windows Server 2022, R Under development (unstable) (2022-03-27 r81997 ucrt) | ||
| * macOS Big Sur 11, R version 4.1.3 (2022-03-10) | ||
|
|
||
|
|
||
| ## R CMD check results | ||
| 0 errors | 0 warnings | 1 note | ||
|
|
||
| only on macOS the following note: | ||
| * checking installed package size ... NOTE | ||
| installed size is 36.9Mb | ||
| sub-directories of 1Mb or more: | ||
| libs 36.4Mb | ||
|
|
||
| and on some linux systems: | ||
| * checking installed package size ... NOTE | ||
| installed size is 5.3Mb | ||
| sub-directories of 1Mb or more: | ||
| libs 4.5Mb | ||
|
|
||
| The large install size is due to the required library GEOS. The size of the binary package decreased already considerably since the dependency on GDAL was dropped. This package can not use the the R packages rgeos, rgdal, sf etc. because it links to GEOS from its C++ code. All calculations are done in C++ for performance reasons, comparable to package sf. | ||
| The large install size on some OS is due to the required library GEOS. This package can not use the R packages rgeos, rgdal, sf etc. because it links to GEOS from its C++ code. All calculations are done in C++ for performance reasons, comparable to package sf. |