Skip to content

Commit

Permalink
Add warnings to help files
Browse files Browse the repository at this point in the history
  • Loading branch information
baddstats committed Jan 17, 2025
1 parent db67caf commit 20dd7df
Show file tree
Hide file tree
Showing 18 changed files with 169 additions and 15 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: spatstat.geom
Version: 3.3-4.010
Date: 2025-01-07
Version: 3.3-4.011
Date: 2025-01-17
Title: Geometrical Functionality of the 'spatstat' Family
Authors@R: c(person("Adrian", "Baddeley",
role = c("aut", "cre", "cph"),
Expand All @@ -25,7 +25,7 @@ Authors@R: c(person("Adrian", "Baddeley",
person("Rasmus", "Waagepetersen", role = "ctb"))
Maintainer: Adrian Baddeley <[email protected]>
Depends: R (>= 3.5.0), spatstat.data (>= 3.1), spatstat.univar (>= 3.1-0), stats, graphics, grDevices, utils, methods
Imports: spatstat.utils (>= 3.1-1.001), deldir (>= 1.0-2), polyclip (>= 1.10-0)
Imports: spatstat.utils (>= 3.1-2), deldir (>= 1.0-2), polyclip (>= 1.10-0)
Suggests: spatstat.random (>= 3.3), spatstat.explore (>= 3.3), spatstat.model (>= 3.3), spatstat.linnet (>= 3.2), spatial, fftwtools (>= 0.9-8), spatstat (>= 3.2)
Description: Defines spatial data types and supports geometrical operations
on them. Data types include point patterns, windows (domains),
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CHANGES IN spatstat.geom VERSION 3.3-4.010
CHANGES IN spatstat.geom VERSION 3.3-4.011

OVERVIEW

Expand Down
2 changes: 1 addition & 1 deletion inst/doc/packagesizes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
"2024-07-09" "3.3-2" 442 1186 0 35638 15596
"2024-09-18" "3.3-3" 443 1187 0 35818 15596
"2024-11-18" "3.3-4" 444 1190 0 35978 15596
"2025-01-07" "3.3-4.010" 445 1191 0 36158 15596
"2025-01-17" "3.3-4.011" 445 1191 0 36158 15596
2 changes: 1 addition & 1 deletion inst/info/packagesizes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
"2024-07-09" "3.3-2" 442 1186 0 35638 15596
"2024-09-18" "3.3-3" 443 1187 0 35818 15596
"2024-11-18" "3.3-4" 444 1190 0 35978 15596
"2025-01-07" "3.3-4.010" 445 1191 0 36158 15596
"2025-01-17" "3.3-4.011" 445 1191 0 36158 15596
12 changes: 12 additions & 0 deletions man/distfun.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@
It also belongs to the class \code{"funxy"} which has methods
for \code{plot}, \code{contour} and \code{persp}.
}
\section{Distance values}{
The values returned by the distance function
\code{f <- distfun(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is
a composite expression such as \sQuote{2 microns},
then the values of \code{f} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{distmap}},
\code{\link{summary.distfun}},
Expand Down
13 changes: 12 additions & 1 deletion man/distmap.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,18 @@
This is generic. Methods are provided for
point patterns (\code{\link{distmap.ppp}}),
line segment patterns (\code{\link{distmap.psp}})
and windows (\code{\link{distmap.owin}}).
and windows (\code{\link{distmap.owin}}) as well as other classes.
}
\section{Distance values}{
The pixel values in the image \code{distmap(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite expression
such as \sQuote{2 microns},
then the values in \code{distmap(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{distmap.ppp}},
Expand Down
11 changes: 11 additions & 0 deletions man/distmap.owin.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,17 @@
This function is a method for the generic \code{\link{distmap}}.
}
\section{Distance values}{
The pixel values in the image \code{distmap(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.
Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values in \code{distmap(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{distmap}},
\code{\link{distmap.ppp}},
Expand Down
16 changes: 15 additions & 1 deletion man/distmap.ppp.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,28 @@
to the nearest data point in \code{X}, use \code{\link{distfun}} or
\code{\link{nncross}}.
}
\section{Distance values}{
The pixel values in the image \code{distmap(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values in \code{distmap(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
Generic function \code{\link{distmap}} and other methods
\code{\link{distmap.psp}},
\code{\link{distmap.owin}}.

Generic function \code{\link{distfun}}.

Nearest neighbour distance \code{\link{nncross}}
Nearest neighbour distance \code{\link{nncross}}.

\code{\link{unitname}} and \code{\link{rescale}} to control the unit
of length.
}
\examples{
U <- distmap(cells)
Expand Down
11 changes: 11 additions & 0 deletions man/distmap.psp.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@
low-level functions \code{\link{nncross}}
or \code{\link{project2segment}}.
}
\section{Distance values}{
The pixel values in the image \code{distmap(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite expression
such as \sQuote{2 microns},
then the values in \code{distmap(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{distmap}},
\code{\link{distmap.owin}},
Expand Down
11 changes: 11 additions & 0 deletions man/nndist.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,17 @@
distance is not defined (e.g. if there is only one point
in the point pattern).
}
\section{Distance values}{
The values returned by \code{nndist(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values of \code{nndist(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{nndist.psp}},
\code{\link{nndist.pp3}},
Expand Down
11 changes: 11 additions & 0 deletions man/nndist.pp3.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,17 @@
To find the nearest neighbour distances from one point pattern
to another point pattern, use \code{\link{nncross}}.
}
\section{Distance values}{
The values returned by \code{nndist(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values of \code{nndist(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\section{Warnings}{
An infinite or \code{NA} value is returned if the
distance is not defined (e.g. if there is only one point
Expand Down
11 changes: 11 additions & 0 deletions man/nndist.ppx.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@
To obtain the spatial distance between points in a space-time point
pattern, set \code{temporal=FALSE}.
}
\section{Distance values}{
The values returned by \code{nndist(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values of \code{nndist(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\section{Warnings}{
An infinite or \code{NA} value is returned if the
distance is not defined (e.g. if there is only one point
Expand Down
11 changes: 11 additions & 0 deletions man/nndist.psp.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@
(the default) then compiled \code{C} code is used.
The \code{C} code is somewhat faster.
}
\section{Distance values}{
The values returned by \code{nndist(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values of \code{nndist(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{nndist}},
\code{\link{nndist.ppp}}
Expand Down
11 changes: 11 additions & 0 deletions man/pairdist.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@
for \code{\link{pairdist.ppp}}, \code{\link{pairdist.psp}}
or \code{\link{pairdist.default}} for details.
}
\section{Distance values}{
The values returned by \code{pairdist(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values of \code{pairdist(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{pairdist.ppp}},
\code{\link{pairdist.psp}},
Expand Down
15 changes: 13 additions & 2 deletions man/pairdist.pp3.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
points in \code{X}, and returns the matrix of distances.

Alternatively if \code{periodic=TRUE} and the window containing \code{X} is a
box, then the distances will be computed in the `periodic'
sense (also known as `torus' distance): opposite faces of the
box, then the distances will be computed in the \sQuote{periodic}
sense (also known as \sQuote{torus} distance): opposite faces of the
box are regarded as equivalent.
This is meaningless if the window is not a box.

Expand All @@ -46,6 +46,17 @@
The squared distances are faster to calculate, and are sufficient for
many purposes (such as finding the nearest neighbour of a point).
}
\section{Distance values}{
The values returned by \code{pairdist(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values of \code{pairdist(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{pairdist}},
\code{\link{crossdist}},
Expand Down
11 changes: 11 additions & 0 deletions man/pairdist.ppp.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,17 @@
computed using interpreted R code only. If \code{method="C"}
(the default) then C code is used. The C code is somewhat faster.
}
\section{Distance values}{
The values returned by \code{pairdist(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values of \code{pairdist(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{pairdist}},
\code{\link{pairdist.default}},
Expand Down
14 changes: 12 additions & 2 deletions man/pairdist.ppx.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@
To obtain the spatial distance between points in a space-time point
pattern, set \code{temporal=FALSE}.
}
\section{Distance values}{
The values returned by \code{pairdist(X, temporal=FALSE)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values of \code{pairdist(X, temporal=FALSE)}
are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{pairdist}},
\code{\link{crossdist}},
Expand All @@ -45,8 +57,6 @@
}
\author{
\adrian


}
\keyword{spatial}
\keyword{math}
Expand Down
14 changes: 11 additions & 3 deletions man/pairdist.psp.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,17 @@
(the default) then compiled \code{C} code is used,
which is somewhat faster.
}
\section{Distance values}{
The values returned by \code{pairdist(X)} are distances,
expressed as multiples of the unit of length of the spatial
coordinates in \code{X}.
The unit of length is given by \code{\link{unitname}(X)}.

Note that, if the unit of length in \code{X} is a composite
expression such as \sQuote{2 microns},
then the values of \code{pairdist(X)} are expressed as multiples
of 2 microns, rather than being expressed in microns.
}
\seealso{
\code{\link{crossdist}},
\code{\link{nndist}},
Expand All @@ -68,10 +79,7 @@
}
\author{
\adrian


and \rolf

}
\keyword{spatial}
\keyword{math}
Expand Down

0 comments on commit 20dd7df

Please sign in to comment.