Skip to content

Commit c8268fc

Browse files
committed
Ready for CRAN
1 parent db287fd commit c8268fc

File tree

7 files changed

+44
-8
lines changed

7 files changed

+44
-8
lines changed

DESCRIPTION

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: spatstat.linnet
2-
Version: 2.3-0.006
3-
Date: 2021-11-15
2+
Version: 2.3-1
3+
Date: 2021-12-11
44
Title: Linear Networks Functionality of the 'spatstat' Family
55
Authors@R: c(person("Adrian", "Baddeley",
66
role = c("aut", "cre"),
@@ -23,7 +23,6 @@ Maintainer: Adrian Baddeley <Adrian.Baddeley@curtin.edu.au>
2323
Depends: R (>= 3.5.0), spatstat.data (>= 2.1-0), spatstat.geom (>= 2.3-0), spatstat.core (>= 2.3-0), stats, graphics, grDevices, methods, utils
2424
Imports: spatstat.utils (>= 2.2-0), Matrix, spatstat.sparse (>= 2.0)
2525
Suggests: goftest, locfit, spatstat (>= 2.0-0)
26-
Additional_repositories: https://spatstat.r-universe.dev
2726
Description: Defines types of spatial data on a linear network
2827
and provides functionality for geometrical operations,
2928
data analysis and modelling of data on a linear network,

NAMESPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export("bw.voronoi")
7575
export("cdf.test.lpp")
7676
export("cdf.test.lppm")
7777
export("chop.linnet")
78+
export("circumradius.linnet")
7879
export("clickjoin")
7980
export("clicklpp")
8081
export("coef.lppm")
@@ -248,6 +249,7 @@ export("response.lppm")
248249
export("rhohat.lpp")
249250
export("rhohat.lppm")
250251
export("rjitter.lpp")
252+
export("rjitterlpp")
251253
export("rlpp")
252254
export("roc.lpp")
253255
export("roc.lppm")
@@ -358,6 +360,7 @@ S3method("berman.test", "lppm")
358360
S3method("boundingradius", "linnet")
359361
S3method("cdf.test", "lpp")
360362
S3method("cdf.test", "lppm")
363+
S3method("circumradius", "linnet")
361364
S3method("coef", "lppm")
362365
S3method("connected", "linnet")
363366
S3method("connected", "lpp")

NEWS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
CHANGES IN spatstat.linnet VERSION 2.3-0.006
2+
CHANGES IN spatstat.linnet VERSION 2.3-1
33

44
OVERVIEW
55

@@ -21,6 +21,9 @@ SIGNIFICANT USER-VISIBLE CHANGES
2121
The function 'rjitterlpp' has been renamed 'rjitter.lpp'
2222
and is now a method for the generic 'rjitter'.
2323

24+
o rjitterlpp
25+
This function still exists, but is now deprecated in favour of 'rjitter.lpp'.
26+
2427
BUG FIXES
2528

2629
o rjitterlpp

inst/doc/packagesizes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
1919
"2021-06-21" "2.2-0" 134 283 0 10599 3081
2020
"2021-06-22" "2.2-1" 134 283 0 10599 3081
2121
"2021-07-16" "2.3-0" 137 287 0 10920 3232
22-
"2021-11-15" "2.3-0.006" 137 287 0 10947 3232
22+
"2021-12-11" "2.3-1" 138 289 0 10947 3232

man/bw.relrisklpp.Rd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@
156156
set.seed(2020)
157157
X <- superimpose(A=runiflpp(20, simplenet),
158158
B=runifpointOnLines(20, as.psp(simplenet)[1]))
159-
plot(bw.relrisklpp(X, hmin=0.1, hmax=0.3, method="McSwiggan"))
160-
plot(bw.relrisklpp(X, hmin=0.1, hmax=0.3, distance="euclidean"))
159+
plot(bw.relrisklpp(X, hmin=0.1, hmax=0.25, method="McSwiggan"))
160+
plot(bw.relrisklpp(X, hmin=0.1, hmax=0.3, nh=8, distance="euclidean"))
161161
}
162162
\keyword{spatial}
163163
\keyword{methods}

man/relrisk.lpp.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
plot(relrisk(X, 0.2, case="B"))
206206
head(relrisk(X, 0.2, at="points"))
207207
## cross-validated bandwidth selection
208-
plot(relrisk(X, bw.relrisklpp, hmax=0.3))
208+
plot(relrisk(X, bw.relrisklpp, hmax=0.25))
209209

210210
## more than 2 types
211211
if(interactive()) {

man/spatstat.linnet-deprecated.Rd

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
\name{spatstat.linnet-deprecated}
2+
\alias{circumradius.linnet}
3+
\alias{rjitterlpp}
4+
\title{Deprecated spatstat.linnet functions}
5+
\description{
6+
Deprecated spatstat.linnet functions.
7+
}
8+
\usage{
9+
\method{circumradius}{linnet}(x, \dots)
10+
rjitterlpp(X, \dots)
11+
}
12+
13+
\details{
14+
These functions are deprecated, and will eventually be deleted from
15+
the \pkg{spatstat.linnet} package.
16+
17+
18+
19+
\code{rjitterlpp} is replaced by \code{rjitter.lpp}, a method for the
20+
generic \code{rjitter}.
21+
22+
\code{circumradius.linnet} is replaced by the more appropriately named
23+
\code{boundingradius.linnet}.
24+
}
25+
\value{
26+
\code{circumradius.linnet} returns a numeric value.
27+
28+
\code{rjitterlpp} returns a point pattern on a linear network (object of
29+
class \code{"lpp"}).
30+
}
31+
\keyword{internal}

0 commit comments

Comments
 (0)