From e40645ffe35f09daf9fba529d5c5c3012f1e090f Mon Sep 17 00:00:00 2001 From: Philippe Verley <philippe.verley@ird.fr> Date: Mon, 15 Mar 2021 11:44:22 +0000 Subject: [PATCH] Updated references to spatstat specific packages in man pages --- R/util.R | 2 -- man/demopat.Rd | 6 +++--- man/spp.Rd | 8 ++++---- man/swin.Rd | 8 ++++---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/R/util.R b/R/util.R index 985ee28..4de6f23 100755 --- a/R/util.R +++ b/R/util.R @@ -284,8 +284,6 @@ in.poly<-function(x,y,poly,bdry=TRUE) { warning("argument 'bdry' automatically set to FALSE. No alternative implemented yet") } stopifnot(is.poly(poly)) - xp <- poly$x - yp <- poly$y npts <- length(x) nedg <- length(poly$x) # sic xmi<-ifelse(min(x)<=min(poly$x),min(x),min(poly$x)) diff --git a/man/demopat.Rd b/man/demopat.Rd index d8ddf2a..e96172e 100755 --- a/man/demopat.Rd +++ b/man/demopat.Rd @@ -2,17 +2,17 @@ \encoding{latin1} \alias{demopat} \docType{data} -\title{Artificial Data Point Pattern from \code{spatstat} package.} +\title{Artificial Data Point Pattern from \code{spatstat.data} package.} \description{ This is an artificial dataset, for use in testing and demonstrating compatibility between \code{spatstat} and \code{ads} objects. It is a multitype point pattern in an irregular polygonal window. There are two types of points. The window contains a polygonal hole. } \usage{data(demopat)} \format{ -An object of class "ppp" representing a \code{spatstat} point pattern. +An object of class "ppp" representing a \code{spatstat.core} point pattern. } \source{ - data(demopat) in \code{spatstat} + data(demopat) in \code{spatstat.data} } \examples{ data(demopat) diff --git a/man/spp.Rd b/man/spp.Rd index 39f97cc..71518d9 100755 --- a/man/spp.Rd +++ b/man/spp.Rd @@ -24,7 +24,7 @@ ppp2spp(p) complex sampling window (see \code{\link{swin}}).} \item{marks}{(optional) a vector of mark values, which may be factor levels or numerical values (see Details).} \item{int2fac}{if TRUE, integer marks are automatically coerced into factor levels.} - \item{p}{a \code{"ppp"} object from package \code{spatstat}.} + \item{p}{a \code{"ppp"} object from package \code{spatstat.geom}.} } \details{ A spatial point pattern is assumed to have been observed within a specific @@ -58,11 +58,11 @@ A spatial point pattern is assumed to have been observed within a specific \item{\code{$marksout}}{(optional) a vector of the marks attached to points located outside the sampling window.} } \references{ - Goreaud, F. and PĂ©lissier, R. 1999. On explicit formula of edge effect correction for Ripley's \emph{K}-function. \emph{Journal of Vegetation Science}, 10:433-438. + Goreaud, F. and P?lissier, R. 1999. On explicit formula of edge effect correction for Ripley's \emph{K}-function. \emph{Journal of Vegetation Science}, 10:433-438. } \note{ There are printing, summary and plotting methods for \code{"spp"} objects.\cr -Function \code{ppp2spp} converts an \code{\link[spatstat]{ppp.object}} from package \code{spatstat} into an \code{"spp"} object. +Function \code{ppp2spp} converts an \code{\link[spatstat.geom]{ppp.object}} from package \code{spatstat.geom} into an \code{"spp"} object. } \seealso{ \code{\link{plot.spp}}, @@ -105,7 +105,7 @@ Function \code{ppp2spp} converts an \code{\link[spatstat]{ppp.object}} from pack plot(swrt, out=TRUE) # plot points outside the sampling window - \dontrun{converting a ppp object from spatstat} + \dontrun{converting a ppp object from spatstat.geom} data(demopat) demo.spp<-ppp2spp(demopat) plot(demo.spp) diff --git a/man/swin.Rd b/man/swin.Rd index bce930f..3ed9705 100755 --- a/man/swin.Rd +++ b/man/swin.Rd @@ -22,7 +22,7 @@ for a rectangle ; \code{c(x0,y0,r0)} for a circle.} \item{triangles}{(optional) a list of triangles removed from a simple initial window to define a complex sampling window (see Details).}` - \item{w}{a \code{"owin"} object from package \code{spatstat}.} + \item{w}{a \code{"owin"} object from package \code{spatstat.geom}.} } \details{ A sampling window may be of simple or complex type. A simple sampling window may be a rectangle or a circle. @@ -55,11 +55,11 @@ A sampling window may be of simple or complex type. A simple sampling window may \item{\code{$triangles}}{(optional) vertices coordinates of triangles for a complex sampling window (see details).} } \references{ - Goreaud, F. and PĂ©lissier, R. 1999. On explicit formula of edge effect correction for Ripley's \emph{K}-function. \emph{Journal of Vegetation Science}, 10:433-438. + Goreaud, F. and P?lissier, R. 1999. On explicit formula of edge effect correction for Ripley's \emph{K}-function. \emph{Journal of Vegetation Science}, 10:433-438. } \note{ There are printing, summary and plotting methods for \code{"swin"} objects.\cr -Function \code{owin2swin} converts an \code{\link[spatstat]{owin.object}} from package \code{spatstat} into an \code{"swin"} object. +Function \code{owin2swin} converts an \code{\link[spatstat.geom]{owin.object}} from package \code{spatstat.geom} into an \code{"swin"} object. } \seealso{ \code{\link{area.swin}}, @@ -101,7 +101,7 @@ Function \code{owin2swin} converts an \code{\link[spatstat]{owin.object}} from p summary(wch) plot(wch) - \dontrun{converting an owin object from spatstat} + \dontrun{converting an owin object from spatstat.geom} data(demopat) demo.swin<-owin2swin(demopat$window) plot(demo.swin) -- GitLab