package recmap_1.0.0.tar.gz is on its way to CRAN.

cpanse · Sep 16, 2018 · da50dc1 · da50dc1
1 parent 270c54c
commit da50dc1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ shiny::runApp(recmap_shiny, display.mode = 'normal')
 
 ## Related approaches
 * [Rectangular Cartograms: the game](http://www.win.tue.nl/~speckman/demos/game/index.html), [Rectangular Cartograms](http://www.win.tue.nl/~speckman/Cartograms/SoccerCarto.html)
-* [cartogram: Create Cartograms with R](https://CRAN.R-project.org/package=cartogram)
+* cartogram: Create Cartograms with R [https://CRAN.R-project.org/package=cartogram](https://CRAN.R-project.org/package=cartogram)
 * [Rcartogram](https://github.com/omegahat/Rcartogram)
 * [High-performance software to produce flow-based cartograms.](https://github.com/Flow-Based-Cartograms/go_cart) 
 * see also [CRAN Task View: Analysis of Spatial Data](https://CRAN.R-project.org/view=Spatial)
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -1,9 +1,11 @@
 \name{NEWS}
 \title{News for Package 'recmap'}
 
-\section{Changes until version 1.0.0 (2018-08-28)}{
+\section{Changes until version 1.0.0 (2018-09-16)}{
   \itemize{
-	  \item incorporate CITATION file to refer back to the JSS manuscript doi 10.18637/jss.v086.c01.
+	  \item incorporate CITATION file to refer back to 
+	  the JSS manuscript doi
+	  \href{https://www.jstatsoft.org/article/view/v086c01}{10.18637/jss.v086.c01}.
   }
 }
 

diff --git a/man/jss2711.Rd b/man/jss2711.Rd
@@ -12,9 +12,9 @@ jss2711 data
 }
 
 \description{
-jss2711 contains the data and maps (input and output) for the 
-\href{https://arxiv.org/abs/1606.00464}{manuscript}
-Figures 4, 5, 6, 7, 11, 12, 13.
+jss2711 contains the replication materials (input and output) for the 
+\href{http://dx.doi.org/10.18637/jss.v086.c01}{jss.v086.c01} manuscript's
+Figures 4, 5, 6, 7, 11, 12, and 13.
 }
 
 \format{
@@ -33,7 +33,8 @@ Figures 4, 5, 6, 7, 11, 12, 13.
   }
 
   \item{Figure 5 -- \code{cmp_GA_GRASP} contains a \code{list} of results using 
-a \code{\link[recmap:recmapGA]{GRASP}} and \code{\link[GA:ga]{GA}} metaheuristic. Generated on a MacBook Pro (Retina, 13-inch, Mid 2014).}
+a \code{\link[recmap:recmapGA]{GRASP}} and \code{\link[GA:ga]{GA}} metaheuristic.
+Generated on a MacBook Pro (Retina, 13-inch, Mid 2014).}
 
   \item{Figure 11 -- \code{Switzerland}:
     \itemize{
@@ -71,7 +72,7 @@ a \code{\link[recmap:recmapGA]{GRASP}} and \code{\link[GA:ga]{GA}} metaheuristic
 \references{
 Panse C (2018). "Rectangular Statistical Cartograms in R: The recmap
 Package." Journal of Statistical Software, Code Snippets, 86(1),
-pp. 1-27. doi: 10.18637/jss.v086.c01
+pp. 1-27. doi: \href{http://dx.doi.org/10.18637/jss.v086.c01}{10.18637/jss.v086.c01}.
 }
 
 \examples{

diff --git a/man/recmap.Rd b/man/recmap.Rd
@@ -141,11 +141,12 @@ metaheuristic.
 \item Roland Heilmann, Daniel Keim, Christian Panse, and Mike Sips (2004). 
 "RecMap: Rectangular Map Approximations."
 InfoVis 2004, IEEE Symposium on Information Visualization, Austin, Texas, 33-40.
-\url{http://dx.doi.org/10.1109/INFVIS.2004.57}.
+doi: \href{http://dx.doi.org/10.1109/INFVIS.2004.57}{10.1109/INFVIS.2004.57}.
 
 \item Panse C (2018). "Rectangular Statistical Cartograms in R: The recmap
 Package." Journal of Statistical Software, Code Snippets, 86(1),
-pp. 1-27. doi: 10.18637/jss.v086.c01.
+pp. 1-27. doi: \href{http://dx.doi.org/10.18637/jss.v086.c01}{10.18637/jss.v086.c01}.
+
 }
 }
 
@@ -167,8 +168,6 @@ pp. 1-27. doi: 10.18637/jss.v086.c01.
   \item The package vignette
   \url{https://CRAN.R-project.org/package=recmap/vignettes/recmap.html} 
   or by calling \code{vignette("recmap")} on the R command prompt.
-  
-  \item A shiny web application \url{https://recmap.shinyapps.io/state_x77/}.
   }
 }
 

diff --git a/vignettes/recmap.Rmd b/vignettes/recmap.Rmd
@@ -54,7 +54,7 @@ are tried to be preserved.
 The ratios are preserved, and the area of each region corresponds to 
 the as input given statistical value z.
 
-An example of a rectangular cartogram drawing is shown below.
+The graphic below depicts a typical example of a rectangular cartogram drawing.
 
 ```{r eval = TRUE, echo = FALSE}
 options(prompt = "R> ",
@@ -67,7 +67,7 @@ options(prompt = "R> ",
 ```{r fig.width=7, fig.height=3.5, fig.retina=2, fig.align='left', fig.cap="Rectangular Cartogram of the U.S. election 2004; The area corresponds to the number of electors (color indicates the party red: democrats / blue: Republican; the color intensity ~ outcome of the vote.). The graphic was computed by using the original implementation of the construction heuristic RecMap MP2 introduced in [@recmap].", echo=FALSE, warning=FALSE, comment="ccc", error=FALSE, message=FALSE}
 
 library(recmap)
-op <- par(mar = c(0,0,0,0), bg = 'black')
+op <- par(mar = c(0,0,0,0), bg = NA)
 recmap:::.draw_recmap_us_state_ev()
 par(op)
 # detach("package:recmap", unload=TRUE)
@@ -229,7 +229,7 @@ do not have ideal cartogram solutions according to Definition 1 [@cartodraw].
 
 
 ```{r fig.width=7, fig.height=2.5, fig.align='center', fig.retina=2, fig.cap="checkerboard fun - input, area of black regions have to be four times as big as white regions (left); solution found by a greedy random algorithm (middle); solution found by genetic algorithm (right)", fig.align='left'}
-op <- par(mar = c(0, 0, 0, 0), mfrow = c(1, 3), bg = 'white')
+op <- par(mar = c(0, 0, 0, 0), mfrow = c(1, 3), bg = NA)
 
 plot(checkerboard8x8 <- checkerboard(8),
             col=c('white','white','white','black')[checkerboard8x8$z])

diff --git a/vignettes/recmap.bib b/vignettes/recmap.bib
@@ -12,9 +12,9 @@ @Article{Buchin:2016
 }
 
 @Article{2016arXiv160600464P,
-  title = {Rectangular Statistical Cartograms in {R}: The {recmap} Package},
+  title = {{Rectangular Statistical Cartograms in R: The recmap Package}},
   author = {Christian Panse},
-  journal = {Journal of Statistical Software, Code Snippets},
+  journal = {{Journal of Statistical Software, Code Snippets}},
   year = {2018},
   volume = {86},
   number = {1},