Reintegrate Guerry

adeverse · Oct 27, 2023 · acb7aad · acb7aad
1 parent 7ef9df7
commit acb7aad
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -8,7 +8,7 @@ Description: Graphical functionalities for the representation of multivariate da
 Depends: R (>= 3.0.2)
 License: GPL (>= 2)
 Imports: ade4 (>= 1.7-13), graphics, grid, KernSmooth, lattice, latticeExtra, methods, RColorBrewer, sp (>= 1.1-1), stats
-Suggests: car, knitr, markdown, pixmap, rmarkdown, spdep, splancs
+Suggests: car, Guerry, knitr, markdown, pixmap, rmarkdown, spdep, splancs
 Collate: adeGsenv.R parameter.R utils.R
   utilstriangle.R genericMethod.R utilsclass.R panelfunctions.R ADEg.R ADEgS.R utilsADEgS.R
   ADEg.C1.R C1.barchart.R C1.curve.R C1.curves.R C1.density.R C1.gauss.R C1.dotplot.R C1.hist.R C1.interval.R

diff --git a/tests/panelSpatial.R b/tests/panelSpatial.R
@@ -38,14 +38,14 @@ g3 <- s.class(dfxy2, fac = fac, sp.layout = list(scale2, text12, text22, arrow2,
   porigin.include = FALSE, Sp = meuse.sr)
 
 ## ex3
-# if(require(Guerry)) {
-#   data(gfrance85)
-#   
-#   dfxy4 <- coordinates(gfrance85)
-#   region.names <- data.frame(gfrance85)[, 5]
-#   col.region <- colors()[c(149, 254, 468, 552, 26)]
-#   g4 <- s.class(dfxy4, region.names, ellip = 0, star = 0, col = col.region, Sp = gfrance85, pSp.col = col.region[region.names], porig.inclu = F)
-# }
+if(require(Guerry)) {
+  data(gfrance85)
+
+  dfxy4 <- coordinates(gfrance85)
+  region.names <- data.frame(gfrance85)[, 5]
+  col.region <- colors()[c(149, 254, 468, 552, 26)]
+  g4 <- s.class(dfxy4, region.names, ellip = 0, star = 0, col = col.region, Sp = gfrance85, pSp.col = col.region[region.names], porig.inclu = F)
+}
 
 ## ex4
 library(sp)

diff --git a/vignettes/adegraphics.Rmd b/vignettes/adegraphics.Rmd
@@ -1142,17 +1142,17 @@ Maps and neighbor graphs
 ------------------------
 
 ```{r label=plot37, fig.width=6, fig.height=3}
-# if(require(Guerry)) {
-#   library(sp)
-#   data(gfrance85)
-#   region.names <- data.frame(gfrance85)[, 5]
-#   col.region <- colors()[c(149, 254, 468, 552, 26)]
-#   g30 <- s.class(coordinates(gfrance85), region.names, porigin.include = FALSE, plot = FALSE)
-#   g31 <- s.class(coordinates(gfrance85), region.names, ellipseSize = 0, starSize = 0, 
-#                  Sp = gfrance85, pgrid.draw = FALSE, pSp.col = col.region[region.names], pSp.alpha = 0.4, 
-#                  plot = FALSE)
-#   ADEgS(c(g30, g31), layout = c(1, 2))
-# }
+if(require(Guerry)) {
+  library(sp)
+  data(gfrance85)
+  region.names <- data.frame(gfrance85)[, 5]
+  col.region <- colors()[c(149, 254, 468, 552, 26)]
+  g30 <- s.class(coordinates(gfrance85), region.names, porigin.include = FALSE, plot = FALSE)
+  g31 <- s.class(coordinates(gfrance85), region.names, ellipseSize = 0, starSize = 0,
+                 Sp = gfrance85, pgrid.draw = FALSE, pSp.col = col.region[region.names], pSp.alpha = 0.4,
+                 plot = FALSE)
+  ADEgS(c(g30, g31), layout = c(1, 2))
+}
 ```
 
 ```{r label=plot38, fig.width=6, fig.height=4}