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.

Sign up for GitHub

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

Parallel computation #28

Closed
wants to merge 3 commits into from
Closed

Parallel computation #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e0b7bc
Added optional parallel computation in cartogram_cont.R, relevant for…
spiry34 Aug 27, 2021
2d22518
changes in detectCores options
spiry34 Sep 20, 2021
35c03b6
Improved computation speed with a C++ core function
spiry34 Sep 21, 2021
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
11 changes: 7 additions & 4 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
Package: cartogram
Title: Create Cartograms with R
Version: 0.2.2
Version: 0.2.3
Authors@R: c(
person("Sebastian", "Jeworutzki", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-2671-5253")),
person("Timothee", "Giraud", role = "ctb"),
person("Nicolas", "Lambert", role = "ctb"),
person("Roger", "Bivand", role = c("cph"), email = "[email protected]"),
person("Edzer", "Pebesma", role = "cph"),
person("Jakub", "Nowosad", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0002-1057-3721"))
person("Jakub", "Nowosad", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0002-1057-3721")),
person("Sylvain", "Piry", email = "[email protected]", role = "ctb", comment = c(ORCID = " 0000-0002-7717-7555"))
)
Description: Construct continuous and non-contiguous area cartograms.
URL: https://github.com/sjewo/cartogram
BugReports: https://github.com/sjewo/cartogram/issues
Imports: methods, sf, packcircles
Suggests: rgeos, sp, rgdal, maptools
Imports: methods, sf, packcircles, Rcpp
Suggests: rgeos, sp, rgdal, maptools, parallel, pbapply
License: GPL-3
Encoding: UTF-8
RoxygenNote: 7.1.1
LinkingTo:
Rcpp
2 changes: 2 additions & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export(cartogram_cont)
export(cartogram_dorling)
export(cartogram_ncont)
export(nc_cartogram)
importFrom(Rcpp,sourceCpp)
importFrom(methods,as)
importFrom(methods,is)
importFrom(methods,slot)
Expand All @@ -31,3 +32,4 @@ importFrom(sf,st_is_longlat)
importFrom(sf,st_point)
importFrom(sf,st_union)
importFrom(stats,quantile)
useDynLib(cartogram, .registration = TRUE)
1 change: 1 addition & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[0.2.3] Added optional parallel computing for cartogram_cont (Contiguous cartograms), faster for large maps
[0.2.2] Fix geometry replacement in cartogram_ncont
[0.2.0] Migrated all functions to sf, fixed problems with multipolygons. cartogram functions won't accept features with longitude/latitude coordinates anymore.
[0.1.1] Speedup sf code
Expand Down
7 changes: 7 additions & 0 deletions R/RcppExports.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Generated by using Rcpp::compileAttributes() -> do not edit by hand
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

dougenik_core_cpp <- function(pts, C, radii, masses, forceReductionFactor) {
.Call('_cartogram_dougenik_core_cpp', PACKAGE = 'cartogram', pts, C, radii, masses, forceReductionFactor)
}

Loading