diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 13278ec..96459d1 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -4,7 +4,7 @@ on: push: branches: [dev] pull_request: - branches: [dev] + branches: [master, dev] workflow_dispatch: name: R-CMD-check @@ -20,7 +20,7 @@ jobs: matrix: config: - {os: macos-latest, r: 'release'} - #- {os: windows-latest, r: 'release'} + - {os: windows-latest, r: 'release'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - {os: ubuntu-latest, r: 'release'} - {os: ubuntu-latest, r: 'oldrel-1'} diff --git a/DESCRIPTION b/DESCRIPTION index 6889164..c293257 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -5,7 +5,7 @@ Authors@R: c( person(given = "Michael", family = "Jahn", role = c("aut", "cre"), - email = "michael.jahn@scilifelab.se", + email = "jahn@mpusp.mpg.de", comment = c(ORCID = "0000-0002-3913-153X")), person(given = "David", family = "Leslie", @@ -54,7 +54,6 @@ LinkingTo: Rcpp, RcppCGAL, BH -Remotes: ericdunipace/RcppCGAL Encoding: UTF-8 LazyData: true RoxygenNote: 7.2.3 diff --git a/README.Rmd b/README.Rmd index 0c7e73e..923fbfa 100644 --- a/README.Rmd +++ b/README.Rmd @@ -233,9 +233,7 @@ drawTreemap(tm3, add = TRUE, layout = c(1,3), position = c(1, 3)) ### Advanced example for Voronoi treemaps -This example will cover the generation of a somewhat larger treemap, as it is often useful to visualize e.g. many genes or proteins at once in molecular biology studies. However, treemaps can be used for any type of data visualization. First we read a proteomics test data set from Jahn et al., Cell Reports, 2018. -(https://www.cell.com/cell-reports/fulltext/S2211-1247(18)31485-2) -This dataset contains thousands of protein measurements of the cyanobacterium _Synechocystis_ sp. PCC6803. +This example will cover the generation of a somewhat larger treemap, as it is often useful to visualize e.g. many genes or proteins at once in molecular biology studies. However, treemaps can be used for any type of data visualization. First we read a proteomics test data set from [Jahn et al., Cell Reports, 2018](https://pubmed.ncbi.nlm.nih.gov/30304686/). This dataset contains thousands of protein measurements of the cyanobacterium _Synechocystis_ sp. PCC6803. ```{r, message = FALSE, error = FALSE, results = 'hide'} # additional libraries for data filtering and colors diff --git a/README.md b/README.md index 6b22687..753fb29 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ WeightedTreemaps ================ Michael Jahn, David Leslie, Ahmadou Dicko -2023-10-05 +2023-11-06 @@ -278,9 +278,8 @@ drawTreemap(tm3, add = TRUE, layout = c(1,3), position = c(1, 3)) This example will cover the generation of a somewhat larger treemap, as it is often useful to visualize e.g. many genes or proteins at once in molecular biology studies. However, treemaps can be used for any type of -data visualization. First we read a proteomics test data set from Jahn -et al., Cell Reports, 2018. -() +data visualization. First we read a proteomics test data set from [Jahn +et al., Cell Reports, 2018](https://pubmed.ncbi.nlm.nih.gov/30304686/). This dataset contains thousands of protein measurements of the cyanobacterium *Synechocystis* sp. PCC6803. diff --git a/cran-comments.md b/cran-comments.md index 931f1fc..9454d70 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -53,7 +53,7 @@ File ‘WeightedTreemaps/libs/WeightedTreemaps.so’: of to the console, nor use Fortran I/O nor system RNGs. ``` -The C++ function `voronoiDiagram.cpp` does not contain any such entry points. This Note is caused by the upstream dependency CGAL 4 headers (R package `cgal4h`). This note appears only when checking on Mac OS. +The C++ function `voronoiDiagram.cpp` does not contain any such entry points. This Note is caused by the upstream dependency CGAL headers (R package `RcppCGAL`) or boost headers (`BH`). This note appears only when checking on Mac OS. 2. Note: @@ -65,7 +65,7 @@ checking installed package size ... NOTE libs 7.7Mb ``` -Installed package size exceeding 5 MB is mainly caused by the compiled function `voronoiDiagram.o`. The size of this function can not be easily reduced. +Installed package size exceeding 5 MB is mainly caused by the compiled function `voronoiDiagram.o`. The size of this file can not be reduced. ## Downstream dependencies