Tweaks; ready for CRAN

spatstat · Jan 26, 2023 · 1d1de95 · 1d1de95
1 parent a8c017f
commit 1d1de95
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: spatstat.explore
-Version: 3.0-5.002
-Date: 2023-01-15
+Version: 3.0-6
+Date: 2023-01-26
 Title: Exploratory Data Analysis for the 'spatstat' Family
 Authors@R: c(person("Adrian", "Baddeley", 
                     role = c("aut", "cre", "cph"),
@@ -55,7 +55,7 @@ Authors@R: c(person("Adrian", "Baddeley",
 	     person("Hangsheng", "Wang",
 	            role = "ctb"))
 Maintainer: Adrian Baddeley <Adrian.Baddeley@curtin.edu.au>
-Depends: R (>= 3.5.0), spatstat.data (>= 3.0), spatstat.geom (>= 3.0-4.009), spatstat.random (>= 3.0), stats, graphics, grDevices, utils, methods, nlme
+Depends: R (>= 3.5.0), spatstat.data (>= 3.0), spatstat.geom (>= 3.0-5), spatstat.random (>= 3.1), stats, graphics, grDevices, utils, methods, nlme
 Imports: spatstat.utils (>= 3.0), spatstat.sparse (>= 3.0), goftest (>= 1.2-2), Matrix, abind
 Suggests: sm, maptools (>= 0.9-9), gsl, locfit, spatial, fftwtools (>= 0.9-8), spatstat.linnet (>= 3.0), spatstat.model (>= 3.0), spatstat (>= 3.0)
 Additional_repositories: https://spatstat.r-universe.dev

diff --git a/NEWS b/NEWS
@@ -1,10 +1,9 @@
 
-        CHANGES IN spatstat.explore VERSION 3.0-5.002
+        CHANGES IN spatstat.explore VERSION 3.0-6
 
 OVERVIEW
 
-    o Minor improvements.
-
+    o Internal improvements and bug fixes.
 
         CHANGES IN spatstat.explore VERSION 3.0-5
 

diff --git a/inst/CITATION b/inst/CITATION
@@ -13,7 +13,7 @@ citEntry(entry = "Book",
   paste("Adrian Baddeley, Ege Rubak, Rolf Turner (2015).",
         "Spatial Point Patterns: Methodology and Applications with R.",
         "London: Chapman and Hall/CRC Press, 2015.",
-        "URL https://www.routledge.com/Spatial-Point-Patterns-Methodology-and-Applications-with-R/Baddeley-Rubak-Turner/9781482210200/")
+        "URL https://www.routledge.com/Spatial-Point-Patterns-Methodology-and-Applications-with-R/Baddeley-Rubak-Turner/p/book/9781482210200/")
 )
 
 citEntry(entry = "Article",
@@ -31,8 +31,8 @@ citEntry(entry = "Article",
 
   textVersion  =
   paste("Adrian Baddeley, Rolf Turner, Jorge Mateu, Andrew Bevan (2013).",
-        "Hybrids of Gibbs Point Process Models and Their Implementation.",
-        "Journal of Statistical Software, 55(11), 1-43.",
+        "Hybrids of Gibbs Point Process Models and Their Implementation",
+        "Journal of Statistical Software, 55(11), 1-43",
         "DOI: 10.18637/jss.v055.i11"),
 
   header       = "If you use hybrid models, please also cite:"

diff --git a/inst/doc/packagesizes.txt b/inst/doc/packagesizes.txt
@@ -1,4 +1,4 @@
 date version nhelpfiles nobjects ndatasets Rlines srclines
 "2022-05-25" "3.0-0" 224 500 0 30319 6183
 "2022-11-08" "3.0-4" 226 507 0 30638 6295
-"2023-01-15" "3.0-5.002" 226 507 0 30644 6295
+"2023-01-26" "3.0-6" 226 507 0 30644 6295
diff --git a/man/envelopeArray.Rd b/man/envelopeArray.Rd
@@ -74,8 +74,17 @@ envelopeArray(X, fun, \dots, dataname = NULL, verb = FALSE, reuse = TRUE)
   \code{\link{envelope}}, \code{\link{alltypes}}.
 }
 \examples{
-  Nsim <- if(interactive()) 19 else 3
-  A <- envelopeArray(finpines, markcrosscorr, nsim=Nsim)
+  if(interactive()) {
+    Nsim <- 19
+    X <- finpines
+    co <- "best"
+  } else {
+    ## smaller task to reduce check time
+    Nsim <- 3
+    X <- finpines[c(FALSE, TRUE)]
+    co <- "none"
+  }
+  A <- envelopeArray(X, markcrosscorr, nsim=Nsim, correction=co)
   plot(A)
 }
 \keyword{spatial}