Skip to content

Commit

Permalink
Fix cross-references to satisfy CRAN
Browse files Browse the repository at this point in the history
  • Loading branch information
baddstats committed Jul 9, 2024
1 parent 4d74aa2 commit 1754b09
Show file tree
Hide file tree
Showing 55 changed files with 105 additions and 99 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: spatstat.geom
Version: 3.3-1
Date: 2024-07-06
Version: 3.3-2
Date: 2024-07-09
Title: Geometrical Functionality of the 'spatstat' Family
Authors@R: c(person("Adrian", "Baddeley",
role = c("aut", "cre", "cph"),
Expand Down
8 changes: 7 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
CHANGES IN spatstat.geom VERSION 3.3-2

OVERVIEW

o Tweaks to documentation to satisfy the package checker.

CHANGES IN spatstat.geom VERSION 3.3-1

OVERVIEW

o Tweaks to documentation to satisfy the package checker.
o Tweaks to documentation to satisfy the package checker.

CHANGES IN spatstat.geom VERSION 3.3-0

Expand Down
2 changes: 1 addition & 1 deletion inst/doc/packagesizes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
"2024-01-26" "3.2-8" 452 1204 0 36234 15822
"2024-02-28" "3.2-9" 452 1209 0 36325 15824
"2024-07-05" "3.3-0" 442 1186 0 35638 15596
"2024-07-06" "3.3-1" 442 1186 0 35638 15596
"2024-07-09" "3.3-2" 442 1186 0 35638 15596
2 changes: 1 addition & 1 deletion inst/info/packagesizes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
"2024-01-26" "3.2-8" 452 1204 0 36234 15822
"2024-02-28" "3.2-9" 452 1209 0 36325 15824
"2024-07-05" "3.3-0" 442 1186 0 35638 15596
"2024-07-06" "3.3-1" 442 1186 0 35638 15596
"2024-07-09" "3.3-2" 442 1186 0 35638 15596
12 changes: 6 additions & 6 deletions man/Window.tess.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@
\item{\dots}{Ignored.}
}
\value{
An object of class \code{"owin"} (see \code{\link{owin.object}})
An object of class \code{"owin"} (see \code{\link[spatstat.geom]{owin.object}})
specifying an observation window.
}
\details{
These are methods for the generic function \code{\link{Window}}
These are methods for the generic function \code{\link[spatstat.geom]{Window}}
which extract the spatial window in which the object \code{X}
is defined.
}
\seealso{
\code{\link{Window}},
\code{\link{Window.ppp}},
\code{\link{Window.psp}}.
\code{\link[spatstat.geom]{Window}},
\code{\link[spatstat.geom]{Window.ppp}},
\code{\link[spatstat.geom]{Window.psp}}.

\code{\link{owin.object}}
\code{\link[spatstat.geom]{owin.object}}
}
\examples{
A <- quadratcount(cells, 4)
Expand Down
2 changes: 1 addition & 1 deletion man/affine.im.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
\item{mat}{Matrix representing a linear transformation.}
\item{vec}{Vector of length 2 representing a translation.}
\item{\dots}{
Optional arguments passed to \code{\link{as.mask}}
Optional arguments passed to \code{\link[spatstat.geom]{as.mask}}
controlling the pixel resolution of the transformed image.
}
}
Expand Down
2 changes: 1 addition & 1 deletion man/affine.owin.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
will be processed by \code{\link{rescue.rectangle}}.
}
\item{\dots}{
Optional arguments passed to \code{\link{as.mask}}
Optional arguments passed to \code{\link[spatstat.geom]{as.mask}}
controlling the pixel resolution of the transformed window,
if \code{X} is a binary pixel mask.
}
Expand Down
4 changes: 2 additions & 2 deletions man/as.im.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
\item{\dots}{Additional arguments passed to \code{X} when \code{X}
is a function.}
\item{eps,dimyx,xy,rule.eps}{
Optional parameters passed to \code{\link{as.mask}}
Optional parameters passed to \code{\link[spatstat.geom]{as.mask}}
which determine the pixel array geometry.
See \code{\link{as.mask}}.
See \code{\link[spatstat.geom]{as.mask}}.
}
\item{na.replace}{Optional value to replace \code{NA} entries in the
output image.
Expand Down
4 changes: 2 additions & 2 deletions man/as.matrix.owin.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
}
\arguments{
\item{x}{A window (object of class \code{"owin"}).}
\item{\dots}{Arguments passed to \code{\link{as.mask}} to control the
\item{\dots}{Arguments passed to \code{\link[spatstat.geom]{as.mask}} to control the
pixel resolution.}
}
\details{
The function \code{as.matrix.owin} converts a window to a
logical matrux.

It first converts the window \code{x} into a binary pixel mask
using \code{\link{as.mask}}. It then extracts the pixel entries
using \code{\link[spatstat.geom]{as.mask}}. It then extracts the pixel entries
as a logical matrix.

The resulting matrix has entries that are
Expand Down
2 changes: 1 addition & 1 deletion man/as.polygonal.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ as.polygonal(W, repair=FALSE)
\seealso{
\code{\link{owin}},
\code{\link{as.owin}},
\code{\link{as.mask}},
\code{\link[spatstat.geom]{as.mask}},
\code{\link{simplify.owin}}
}
\examples{
Expand Down
4 changes: 2 additions & 2 deletions man/bdist.pixels.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
\arguments{
\item{w}{A window (object of class \code{"owin"}).}
\item{\dots}{
Arguments passed to \code{\link{as.mask}} to determine
Arguments passed to \code{\link[spatstat.geom]{as.mask}} to determine
the pixel resolution.}
\item{style}{
Character string (partially matched) determining the format of
Expand Down Expand Up @@ -53,7 +53,7 @@
If the window is a rectangle or a polygonal region,
the grid of pixels is determined by the arguments \code{"\dots"}
passed to \code{\link{as.mask}}. The distance from each pixel to the
passed to \code{\link[spatstat.geom]{as.mask}}. The distance from each pixel to the
boundary is calculated exactly, using analytic geometry.
This is slower but more accurate than in the case of a binary mask.
Expand Down
2 changes: 1 addition & 1 deletion man/boundingcircle.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ boundingcircle(x, \dots)
A window (object of class \code{"owin"}), or another spatial object.
}
\item{\dots}{
Arguments passed to \code{\link{as.mask}} to determine the
Arguments passed to \code{\link[spatstat.geom]{as.mask}} to determine the
pixel resolution for the calculation.
}
}
Expand Down
4 changes: 2 additions & 2 deletions man/bufftess.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bufftess(X, breaks, W = Window(X), \dots, polygonal = TRUE)
tessellation will be constructed.
}
\item{\dots}{
Optional arguments passed to \code{\link{as.mask}} controlling the
Optional arguments passed to \code{\link[spatstat.geom]{as.mask}} controlling the
pixel resolution when \code{polygonal=FALSE},
and optional arguments passed to \code{\link[base]{cut.default}}
controlling the labelling of the distance bands.
Expand Down Expand Up @@ -90,7 +90,7 @@ bufftess(X, breaks, W = Window(X), \dots, polygonal = TRUE)
Polygonal calculations are performed using \code{\link{dilation}}
and \code{\link{setminus.owin}}. Pixel calculations are performed
using \code{\link{distmap}} and \code{\link{cut.im}}. See
\code{\link{as.mask}} for details of arguments that control pixel
\code{\link[spatstat.geom]{as.mask}} for details of arguments that control pixel
resolution.

For other kinds of tessellations, see
Expand Down
2 changes: 1 addition & 1 deletion man/closing.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
or a point pattern (object of class \code{"ppp"}).
}
\item{r}{positive number: the radius of the closing.}
\item{\dots}{extra arguments passed to \code{\link{as.mask}}
\item{\dots}{extra arguments passed to \code{\link[spatstat.geom]{as.mask}}
controlling the pixel resolution, if a pixel approximation is used}
\item{polygonal}{
Logical flag indicating whether to compute a polygonal
Expand Down
6 changes: 3 additions & 3 deletions man/commonGrid.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ commonGrid(\dots)
\item{\dots}{
Any number of pixel images (objects of class \code{"im"}),
binary masks (objects of class \code{"owin"} of type \code{"mask"})
or data which can be converted to binary masks by \code{\link{as.mask}}.
or data which can be converted to binary masks by \code{\link[spatstat.geom]{as.mask}}.
}
}
\details{
This function determines a common spatial resolution and spatial domain
for several spatial objects.

The arguments \code{\dots} may be pixel images,
binary masks, or other spatial objects acceptable to \code{\link{as.mask}}.
binary masks, or other spatial objects acceptable to \code{\link[spatstat.geom]{as.mask}}.

The common pixel grid is determined by inspecting all the pixel images
and binary masks in the argument list, finding the pixel grid with the
Expand All @@ -32,7 +32,7 @@ commonGrid(\dots)
at the chosen pixel resolution.
Use \code{\link{as.im}(X, W=M)} to convert a pixel image \code{X} to this new
pixel resolution.
Use \code{\link{as.mask}(W, xy=M)} to convert a window \code{W}
Use \code{\link[spatstat.geom]{as.mask}(W, xy=M)} to convert a window \code{W}
to a binary mask at this new pixel resolution.
See the Examples.
}
Expand Down
2 changes: 1 addition & 1 deletion man/connected.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ connected(X, \dots)
or \code{"interpreted"}. See Details.
}
\item{\dots}{
Arguments passed to \code{\link{as.mask}} to determine the
Arguments passed to \code{\link[spatstat.geom]{as.mask}} to determine the
pixel resolution.
}
\item{connect}{
Expand Down
2 changes: 1 addition & 1 deletion man/connected.tess.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
A tessellation (object of class \code{"tess"}).
}
\item{\dots}{
Arguments passed to \code{\link{as.mask}} to determine the
Arguments passed to \code{\link[spatstat.geom]{as.mask}} to determine the
pixel resolution.
}
}
Expand Down
2 changes: 1 addition & 1 deletion man/covering.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
\item{r}{positive number: the radius of the covering discs.}
\item{\dots}{
extra arguments passed to \code{\link{as.mask}}
extra arguments passed to \code{\link[spatstat.geom]{as.mask}}
controlling the pixel resolution for the calculations.
}
\item{giveup}{
Expand Down
4 changes: 2 additions & 2 deletions man/deltametric.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ deltametric(A, B, p = 2, c = Inf, ...)
Either a positive numeric value, or \code{Inf}.
}
\item{\dots}{
Arguments passed to \code{\link{as.mask}} to determine the
Arguments passed to \code{\link[spatstat.geom]{as.mask}} to determine the
pixel resolution of the distance maps computed by \code{\link{distmap}}.
}
}
Expand Down Expand Up @@ -68,7 +68,7 @@ deltametric(A, B, p = 2, c = Inf, ...)
numerically.
The accuracy of the computation depends on the pixel resolution
which is controlled through the extra arguments \code{\dots} passed
to \code{\link{as.mask}}.
to \code{\link[spatstat.geom]{as.mask}}.
}
\value{
A numeric value.
Expand Down
4 changes: 2 additions & 2 deletions man/dilation.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
or a point pattern (object of class \code{"ppp"}).
}
\item{r}{positive number: the radius of dilation.}
\item{\dots}{extra arguments passed to \code{\link{as.mask}}
\item{\dots}{extra arguments passed to \code{\link[spatstat.geom]{as.mask}}
controlling the pixel resolution, if the pixel approximation is
used; or passed to \code{\link{disc}} if the polygonal approximation
is used.
Expand Down Expand Up @@ -52,7 +52,7 @@
to the dilation is computed.
If \code{polygonal=FALSE} then a pixel approximation
to the dilation is computed from the distance map of \code{w}.
The arguments \code{"\dots"} are passed to \code{\link{as.mask}}
The arguments \code{"\dots"} are passed to \code{\link[spatstat.geom]{as.mask}}
to control the pixel resolution.

When \code{w} is a window, the default (when \code{polygonal=NULL})
Expand Down
4 changes: 2 additions & 2 deletions man/disc.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Creates a circular window

If \code{mask=TRUE}, then the disc is approximated by a binary pixel
mask. The resolution of the mask is controlled by
the arguments \code{\dots} which are passed to \code{\link{as.mask}}.
the arguments \code{\dots} which are passed to \code{\link[spatstat.geom]{as.mask}}.

The argument \code{radius} must be a single positive number.
The argument \code{centre} specifies the disc centre: it can be either
Expand All @@ -62,7 +62,7 @@ Creates a circular window
\code{\link{discs}},
\code{\link{owin.object}},
\code{\link{owin}},
\code{\link{as.mask}}
\code{\link[spatstat.geom]{as.mask}}
}
\note{This function can also be used to generate regular polygons,
by setting \code{npoly} to a small integer value. For example
Expand Down
8 changes: 4 additions & 4 deletions man/discretise.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
deleted by the discretisation.
If \code{move.points=TRUE}, the point coordinates are also discretised.

The window is first discretised using \code{\link{as.mask}}.
The window is first discretised using \code{\link[spatstat.geom]{as.mask}}.
Next,
\itemize{
\item If \code{move.points=TRUE}, each point of \code{X}
Expand All @@ -50,13 +50,13 @@

The arguments \code{eps}, \code{dimyx}, \code{xy} and \code{rule.eps}
control the fineness of the pixel array. They are passed to
\code{\link{as.mask}}.
\code{\link[spatstat.geom]{as.mask}}.

If \code{eps}, \code{dimyx} and \code{xy} are all absent or
\code{NULL}, and if the window of \code{X} is of type \code{"mask"}
to start with, then \code{discretise(X)} returns \code{X} unchanged.

See \code{\link{as.mask}} for further details
See \code{\link[spatstat.geom]{as.mask}} for further details
about the arguments \code{eps}, \code{dimyx},
\code{xy} and \code{rule.eps}, and the process of converting
a window to one of type \code{mask}.
Expand All @@ -78,7 +78,7 @@
and \rolf
}
\seealso{
\code{\link{as.mask}}
\code{\link[spatstat.geom]{as.mask}}
}
\examples{
X <- demopat
Expand Down
2 changes: 1 addition & 1 deletion man/discs.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
\emph{diameters}.)
}
\item{\dots}{
Optional arguments passed to \code{\link{as.mask}} to determine
Optional arguments passed to \code{\link[spatstat.geom]{as.mask}} to determine
the pixel resolution, if \code{mask=TRUE}.
}
\item{separate}{
Expand Down
2 changes: 1 addition & 1 deletion man/distmap.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
a window (object of class \code{"owin"}) or a
line segment pattern (object of class \code{"psp"}).
}
\item{\dots}{Arguments passed to \code{\link{as.mask}}
\item{\dots}{Arguments passed to \code{\link[spatstat.geom]{as.mask}}
to control pixel resolution.
}
}
Expand Down
4 changes: 2 additions & 2 deletions man/distmap.owin.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
A window (object of class \code{"owin"}).
}
\item{\dots}{
Arguments passed to \code{\link{as.mask}}
Arguments passed to \code{\link[spatstat.geom]{as.mask}}
to control pixel resolution.
}
\item{discretise}{
Expand Down Expand Up @@ -70,7 +70,7 @@
then the window will first be converted to a binary pixel mask
and the discrete path distances will be computed.
The arguments \code{\dots} are passed to \code{\link{as.mask}}
The arguments \code{\dots} are passed to \code{\link[spatstat.geom]{as.mask}}
to control the pixel resolution.
This function is a method for the generic \code{\link{distmap}}.
Expand Down
2 changes: 1 addition & 1 deletion man/distmap.ppp.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
\arguments{
\item{X}{A point pattern (object of class \code{"ppp"}).
}
\item{\dots}{Arguments passed to \code{\link{as.mask}}
\item{\dots}{Arguments passed to \code{\link[spatstat.geom]{as.mask}}
to control pixel resolution.
}
\item{clip}{
Expand Down
2 changes: 1 addition & 1 deletion man/distmap.psp.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
\arguments{
\item{X}{A line segment pattern (object of class \code{"psp"}).
}
\item{\dots}{Arguments passed to \code{\link{as.mask}}
\item{\dots}{Arguments passed to \code{\link[spatstat.geom]{as.mask}}
to control pixel resolution.
}
\item{extras}{
Expand Down
4 changes: 2 additions & 2 deletions man/domain.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
\code{\link[spatstat.explore]{domain.quadrattest}},
\code{\link[spatstat.random]{domain.rmhmodel}},
\code{\link[spatstat.linnet]{domain.lpp}}.
\code{\link{Window}},
\code{\link{Frame}}.
\code{\link[spatstat.geom]{Window}},
\code{\link[spatstat.geom]{Frame}}.
}
\examples{
domain(redwood)
Expand Down
Loading

0 comments on commit 1754b09

Please sign in to comment.