Skip to content

Commit

Permalink
Decoupled from the old spatstat
Browse files Browse the repository at this point in the history
  • Loading branch information
baddstats committed Feb 10, 2021
1 parent 4989f46 commit 8fa1f56
Show file tree
Hide file tree
Showing 59 changed files with 198 additions and 122 deletions.
89 changes: 82 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: spatstat.data
Version: 1.7-0
Date: 2020-12-16
Title: Datasets for 'spatstat'
Version: 2.0-0
Date: 2021-02-10
Title: Datasets for 'spatstat' Family
Authors@R: c(person("Adrian", "Baddeley",
role = c("aut", "cre"),
email = "[email protected]",
Expand All @@ -13,14 +13,89 @@ Authors@R: c(person("Adrian", "Baddeley",
person("Ege", "Rubak",
role = "aut",
email = "[email protected]",
comment=c(ORCID="0000-0002-6675-533X")))
comment=c(ORCID="0000-0002-6675-533X")),
person("W", "Aherne", role="ctb"),
person("Freda", "Alexander", role="ctb"),
person("Qi Wei", "Ang", role="ctb"),
person("Sourav", "Banerjee", role="ctb"),
person("Mark", "Berman", role="ctb"),
person("R", "Bernhardt", role="ctb"),
person("Thomas", "Berndtsen", role="ctb"),
person("Andrew", "Bevan", role="ctb"),
person("Jeffrey", "Betts", role="ctb"),
person("Ray", "Cartwright", role="ctb"),
person("Richard", "Condit", role="ctb"),
person("Francis", "Crick", role="ctb"),
person("Marcelino", "de la Cruz Rot", role="ctb"),
person("Jack", "Cuzick", role="ctb"),
person("Peter", "Diggle", role="ctb"),
person("Michael", "Drinkwater", role="ctb"),
person("Stephen", "Eglen", role="ctb"),
person("Robert", "Edwards", role="ctb"),
person("AE", "Esler", role="ctb"),
person("Gregory", "Evans", role="ctb"),
person("Bernard", "Fingleton", role="ctb"),
person("Olivier", "Flores", role="ctb"),
person("David", "Ford", role="ctb"),
person("Robin", "Foster", role="ctb"),
person("Janet", "Franklin", role="ctb"),
person("Neba", "Funwi-Gabga", role="ctb"),
person("DJ", "Gerrard", role="ctb"),
person("Andy", "Green", role="ctb"),
person("Tim", "Griffin", role="ctb"),
person("Ute", "Hahn", role="ctb"),
person("RD", "Harkness", role="ctb"),
person("Arthur", "Hickman", role="ctb"),
person("Stephen", "Hubbell", role="ctb"),
person("Austin", "Hughes", role="ctb"),
person("Jonathan", "Huntington", role="ctb"),
person("MJ", "Hutchings", role="ctb"),
person("Valerie", "Isham", role="ctb"),
person("Aruna", "Jammalamadaka", role="ctb"),
person("Carl", "Knox-Robinson", role="ctb"),
person("Mahdieh", "Khanmohammadi", role="ctb"),
person("Tero", "Kokkila", role="ctb"),
person("Bas", "Kooijman", role="ctb"),
person("Kenneth", "Kosik", role="ctb"),
person("Peter", "Kovesi", role="ctb"),
person("Lily", "Kozmian-Ledward", role="ctb"),
person("Robert", "Lamb", role="ctb"),
person("NA", "Laskurain", role="ctb"),
person("George", "Leser", role="ctb"),
person("Marie-Colette", "van Lieshout", role="ctb"),
person("AF", "Mark", role="ctb"),
person("Jorge", "Mateu", role="ctb"),
person("Annikki", "Makela", role="ctb"),
person("Enrique", "Miranda", role="ctb"),
person("Nicoletta", "Nava", role="ctb"),
person("M", "Numata", role="ctb"),
person("Matti", "Nummelin", role="ctb"),
person("Jens Randel", "Nyengaard", role="ctb"),
person("Yosihiko", "Ogata", role="ctb"),
person("Antti", "Penttinen", role="ctb"),
person("Sandra", "Pereira", role="ctb"),
person("Nicolas", "Picard", role="ctb"),
person("William", "Platt", role="ctb"),
person("Stephen", "Rathbun", role="ctb"),
person("Brian", "Ripley", role="ctb"),
person("Dietrich", "Stoyan", role="ctb"),
person("David", "Strauss", role="ctb"),
person("L", "Strand", role="ctb"),
person("Masaharu", "Tanemura", role="ctb"),
person("Graham", "Upton", role="ctb"),
person("Bill", "Venables", role="ctb"),
person("Sasha", "Voss", role="ctb"),
person("Rasmus", "Waagepetersen", role="ctb"),
person("Keith", "Watkins", role="ctb"),
person("H", "Wendrock", role="ctb")
)
Maintainer: Adrian Baddeley <[email protected]>
Depends: R (>= 3.5.0)
Suggests: spatstat (>= 1.55-0)
Imports: spatstat.utils, Matrix
Description: Contains all the datasets for the 'spatstat' package.
Suggests: spatstat.geom, spatstat.core, spatstat.linnet
Description: Contains all the datasets for the 'spatstat' family of packages.
License: GPL (>= 2)
URL: http://spatstat.org
URL: http://spatstat.org/
LazyData: true
NeedsCompilation: no
ByteCompile: true
Expand Down
1 change: 1 addition & 0 deletions inst/doc/packagesizes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
"2018-09-07" "1.3-2" 57 0 55 0 0
"2020-12-06" "1.6-2" 58 0 56 0 0
"2020-12-16" "1.7-0" 58 0 56 0 0
"2021-02-10" "2.0-0" 58 0 56 0 0
4 changes: 2 additions & 2 deletions man/Kovesi.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
\usage{data(Kovesi)}
\format{
A \code{\link[spatstat]{hyperframe}} with the following columns:
A \code{\link[spatstat.geom]{hyperframe}} with the following columns:

\tabular{ll}{
\code{linear} \tab Logical: whether the sequence is linear. \cr
Expand Down Expand Up @@ -80,7 +80,7 @@
\examples{
Kovesi
LinearBMW <- Kovesi$values[[28]]
if(require(spatstat)) {
if(require(spatstat.geom)) {
plot(colourmap(LinearBMW, range=c(0,1)))

## The following would be suitable for spatstat.options(image.colfun)
Expand Down
2 changes: 1 addition & 1 deletion man/amacrine.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ A marked point pattern.
\code{marks} \tab factor with levels \code{off} and \code{on} \cr
\tab indicating ``off'' and ``on'' cells
}
See \code{\link[spatstat]{ppp.object}} for details of the format.
See \code{\link[spatstat.geom]{ppp.object}} for details of the format.
}
\usage{data(amacrine)}
\source{Peter Diggle, personal communication}
Expand Down
4 changes: 2 additions & 2 deletions man/anemones.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
representing the point pattern of anemone locations.
It is a marked point pattern with numeric marks representing
anemone diameter.
See \code{\link[spatstat]{ppp.object}} for details of the format.
See \code{\link[spatstat.geom]{ppp.object}} for details of the format.
}
\usage{data(anemones)}
\examples{
data(anemones)
if(require(spatstat)) {
if(require(spatstat.geom)) {
# plot diameters on same scale as x, y
plot(anemones, markscale=1)
}
Expand Down
4 changes: 2 additions & 2 deletions man/ants.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
\format{
\code{ants} is an object of class \code{"ppp"}
representing the full point pattern of ants' nests.
See \code{\link[spatstat]{ppp.object}} for details of the format.
See \code{\link[spatstat.geom]{ppp.object}} for details of the format.
The coordinates are scaled so that 1 unit equals 0.5 feet.
The points are marked by species (with levels \code{Cataglyphis}
and \code{Messor}).
Expand All @@ -98,7 +98,7 @@
}
\usage{data(ants)}
\examples{
if(require(spatstat)) {
if(require(spatstat.geom)) {

# Equivalent to Figure 1 of Harkness and Isham (1983)

Expand Down
2 changes: 1 addition & 1 deletion man/austates.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
\examples{
data(austates)
if(require(spatstat)) {
if(require(spatstat.geom)) {
plot(austates)
}
}
Expand Down
2 changes: 1 addition & 1 deletion man/bdspots.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
}
\examples{
data(bdspots)
if(require(spatstat)) {
if(require(spatstat.geom)) {
plot(bdspots, equal.scales=TRUE)
}
}
Expand Down
4 changes: 2 additions & 2 deletions man/bei.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
\format{
\code{bei} is an object of class \code{"ppp"}
representing the point pattern of tree locations.
See \code{\link[spatstat]{ppp.object}} for details of the format.
See \code{\link[spatstat.geom]{ppp.object}} for details of the format.

\code{bei.extra} is a list containing
two pixel images, \code{elev} (elevation in metres) and
\code{grad} (norm of elevation gradient). These pixel images are objects
of class \code{"im"}, see \code{\link[spatstat]{im.object}}.
of class \code{"im"}, see \code{\link[spatstat.geom]{im.object}}.
}
\usage{data(bei)}
\source{
Expand Down
4 changes: 2 additions & 2 deletions man/betacells.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
\code{area} \tab numeric vector giving the \cr
\tab areas of cell profiles (in square microns)
}
See \code{\link[spatstat]{ppp.object}} for details of the format.
See \code{\link[spatstat.geom]{ppp.object}} for details of the format.
}
\usage{data(betacells)}
\source{
Expand Down Expand Up @@ -80,7 +80,7 @@
}
\examples{
plot(betacells)
if(require(spatstat)) {
if(require(spatstat.geom)) {
area <- marks(betacells)$area
plot(betacells \%mark\% sqrt(area/pi), markscale=1)
}
Expand Down
2 changes: 1 addition & 1 deletion man/bramblecanes.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
\code{y} \tab Cartesian \eqn{y}-coordinate of plant \cr
\code{marks} \tab factor with levels 0,1, 2 indicating age
}
See \code{\link[spatstat]{ppp.object}} for details of the format.
See \code{\link[spatstat.geom]{ppp.object}} for details of the format.
}
\usage{data(bramblecanes)}
\source{Hutchings (1979), data published in Diggle (1983)}
Expand Down
4 changes: 2 additions & 2 deletions man/bronzefilter.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
\code{y} \tab Cartesian \eqn{y}-coordinate of bronze grain profile centre\cr
\code{marks} \tab radius of bronze grain profile
}
See \code{\link[spatstat]{ppp.object}} for details of the format.
See \code{\link[spatstat.geom]{ppp.object}} for details of the format.
All coordinates are recorded in mm.
}
\usage{data(bronzefilter)}
\examples{
data(bronzefilter)
if(require(spatstat)) {
if(require(spatstat.geom)) {
plot(bronzefilter, markscale=2)
}
}
Expand Down
2 changes: 1 addition & 1 deletion man/cells.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ point pattern.
\format{
An object of class \code{"ppp"}
representing the point pattern of cell centres.
See \code{\link[spatstat]{ppp.object}} for details of the format.
See \code{\link[spatstat.geom]{ppp.object}} for details of the format.
}
\usage{data(cells)}
\source{Crick and Ripley, see Ripley (1977)}
Expand Down
8 changes: 4 additions & 4 deletions man/cetaceans.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
\format{
The object \code{cetaceans} is a \emph{hyperframe} (see
\code{\link[spatstat]{hyperframe}()}) with 9 rows and 4 columns.
\code{\link[spatstat.geom]{hyperframe}()}) with 9 rows and 4 columns.
Each row of this hyperframe represents a replicate survey.
The columns are \code{whales}, \code{dolphins}, \code{fish}
and \code{plankton}.
Expand All @@ -33,8 +33,8 @@
It currently contains only one entry, \code{patterns}, which
contains the same information as \code{cetaceans} in another form.
This is a list, of class \code{solist}
(\dQuote{spatial object list}; see \code{\link[spatstat]{solist}()},
\code{\link[spatstat]{as.solist}()}).
(\dQuote{spatial object list}; see \code{\link[spatstat.geom]{solist}()},
\code{\link[spatstat.geom]{as.solist}()}).
It is a list of length 9, in which each entry is a marked point
pattern, representing the result of one survey.
Each pattern was obtained by superimposing the
Expand Down Expand Up @@ -83,7 +83,7 @@
}

\examples{
if(require(spatstat)) {
if(require(spatstat.core)) {
cet <- cetaceans
cet$dMplank <- with(cet, distfun(plankton, undef=20))
cet$dMfish <- with(cet, distfun(fish, undef=20))
Expand Down
6 changes: 3 additions & 3 deletions man/chicago.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@

The dataset \code{chicago} is an object of class \code{"lpp"}
representing a point pattern on a linear network.
See \code{\link[spatstat]{lpp}} for further information on the format.
See \code{\link[spatstat.linnet]{lpp}} for further information on the format.

These data were published and analysed in
Ang, Baddeley and Nair (2012).
}
\format{
Object of class \code{"lpp"}.
See \code{\link[spatstat]{lpp}}.
See \code{\link[spatstat.linnet]{lpp}}.
}
\usage{data(chicago)}
\examples{
data(chicago)
if(require(spatstat)) {
if(require(spatstat.linnet)) {
plot(chicago)
plot(as.linnet(chicago), main="Chicago Street Crimes",col="green")
plot(as.ppp(chicago), add=TRUE, col="red", chars=c(16,2,22,17,24,15,6))
Expand Down
8 changes: 4 additions & 4 deletions man/chorley.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
\tab indicating whether this is a case of cancer of the larynx\cr
\tab or cancer of the lung.
}
See \code{\link[spatstat]{ppp.object}} for details of the format.
See \code{\link[spatstat.geom]{ppp.object}} for details of the format.

The dataset \code{chorley.extra} is a list with two components.
The first component \code{plotit} is a function which will
Expand All @@ -34,7 +34,7 @@
\usage{data(chorley)}
\examples{
chorley
if(require(spatstat)) {
if(require(spatstat.geom)) {
summary(chorley)
chorley.extra$plotit()
}
Expand Down Expand Up @@ -80,8 +80,8 @@
Note that, due to the rounding of spatial coordinates,
the data contain duplicated points (two points at the
same location). To determine which points are duplicates,
use \code{\link[spatstat]{duplicated.ppp}}.
To remove the duplication, use \code{\link[spatstat]{unique.ppp}}.
use \code{\link[spatstat.geom]{duplicated.ppp}}.
To remove the duplication, use \code{\link[spatstat.geom]{unique.ppp}}.
}
\references{
Baddeley, A., Turner, R., \Moller, J. and Hazelton, M. (2005)
Expand Down
6 changes: 3 additions & 3 deletions man/clmfires.Rd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}
\format{
\code{clmfires} is a marked point pattern (object of class \code{"ppp"}).
See \code{\link[spatstat]{ppp.object}}.
See \code{\link[spatstat.geom]{ppp.object}}.

\code{clmfires.extra} is a list with two components, named
\code{clmcov100} and \code{clmcov200}, which are lists of pixel images
Expand All @@ -73,7 +73,7 @@ patterns due to \dQuote{jittering} having been applied in order to
avoid such duplication. It is not clear just \emph{how} the fire
locations were jittered. It seems unlikely that the jittering was
done using the \code{jitter()} function from \code{R} or the
\pkg{spatstat} function \code{\link[spatstat]{rjitter}}.
\pkg{spatstat} function \code{\link[spatstat.geom]{rjitter}}.

Of course there are many sets of points which are \emph{virtually}
identical, being separated by distances induced by the jittering.
Expand All @@ -87,7 +87,7 @@ for the years 1998 to 2003.

\usage{data(clmfires)}
\examples{
if(require(spatstat)) {
if(require(spatstat.geom)) {
plot(clmfires, which.marks="cause", cols=2:5, cex=0.25)
plot(clmfires.extra$clmcov100)
# Split the clmfires pattern by year and plot the first and last years:
Expand Down
6 changes: 3 additions & 3 deletions man/concrete.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
}
\details{
The window of the point pattern is a binary mask
(window of type \code{"mask"}; see \code{\link[spatstat]{owin}}
and \code{\link[spatstat]{as.mask}} for more information
(window of type \code{"mask"}; see \code{\link[spatstat.geom]{owin}}
and \code{\link[spatstat.geom]{as.mask}} for more information
about this type of window).
This window in effect consists of the
cement paste matrix, or equivalently of the complement (in the
Expand Down Expand Up @@ -51,7 +51,7 @@
processes. \emph{Cement and Concrete Research} \bold{115} 124 -- 132.
}
\examples{
if(require(spatstat)) {
if(require(spatstat.geom)) {
plot(concrete,chars="+",cols="blue",col="yellow")
# The aggregate is in yellow; the cement paste matrix is in white.
Expand Down
Loading

0 comments on commit 8fa1f56

Please sign in to comment.