Skip to content

Commit 4a68fc9

Browse files
baddstatsbaddstats
committed
Ready for CRAN
1 parent 08fea35 commit 4a68fc9

File tree

5 files changed

+35
-12
lines changed

5 files changed

+35
-12
lines changed

‎DESCRIPTION‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: spatstat.model
2-
Version: 3.2-1.007
3-
Date: 2023-03-16
2+
Version: 3.2-2
3+
Date: 2023-04-21
44
Title: Parametric Statistical Modelling and Inference for the 'spatstat' Family
55
Authors@R: c(person("Adrian", "Baddeley",
66
role = c("aut", "cre", "cph"),
@@ -55,9 +55,9 @@ Authors@R: c(person("Adrian", "Baddeley",
5555
person("Hangsheng", "Wang",
5656
role = "ctb"))
5757
Maintainer: Adrian Baddeley <[email protected]>
58-
Depends: R (>= 3.5.0), spatstat.data (>= 3.0), spatstat.geom (>= 3.0-5), spatstat.random (>= 3.1-3), spatstat.explore (>= 3.0), stats, graphics, grDevices, utils, methods, nlme, rpart
58+
Depends: R (>= 3.5.0), spatstat.data (>= 3.0), spatstat.geom (>= 3.0-5), spatstat.random (>= 3.1-4), spatstat.explore (>= 3.1-0), stats, graphics, grDevices, utils, methods, nlme, rpart
5959
Imports: spatstat.utils (>= 3.0-2), spatstat.sparse (>= 3.0), mgcv, Matrix, abind, tensor, goftest (>= 1.2-2)
60-
Suggests: sm, maptools (>= 0.9-9), gsl, locfit, spatial, RandomFields (>= 3.1.24.1), RandomFieldsUtils(>= 0.3.3.1), fftwtools (>= 0.9-8), nleqslv, glmnet, spatstat.linnet (>= 3.0), spatstat (>= 3.0)
60+
Suggests: sm, maptools (>= 0.9-9), gsl, locfit, spatial, RandomFields (>= 3.1.24.1), RandomFieldsUtils(>= 0.3.3.1), fftwtools (>= 0.9-8), nleqslv, glmnet, spatstat.linnet (>= 3.1), spatstat (>= 3.0)
6161
Additional_repositories: https://spatstat.r-universe.dev
6262
Description: Functionality for parametric statistical modelling and inference for spatial data,
6363
mainly spatial point patterns, in the 'spatstat' family of packages.

‎NEWS‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11

2-
CHANGES IN spatstat.model VERSION 3.2-1.007
2+
CHANGES IN spatstat.model VERSION 3.2-2
33

44
OVERVIEW
55

6-
o Internal reorganisation of files.
6+
o Accelerated some code.
77

8-
o Internal efficiencies.
8+
o Standard errors are now available for 'ppm' models fitted using 'gam'.
9+
10+
o Internal reorganisation.
911

1012
o Minor changes to documentation.
1113

1214
o Bug fixes.
1315

16+
SIGNIFICANT USER-VISIBLE CHANGES
17+
18+
o plot.mppm
19+
New argument 'main'.
20+
1421
BUG FIXES
1522

1623
o predict.ppm
@@ -21,6 +28,21 @@ BUG FIXES
2128
o effectfun
2229
Standard error calculation ('se.fit=TRUE') crashed if the fitted model
2330
was a generalised additive model (fitted with 'use.gam=TRUE').
31+
Fixed.
32+
33+
o parres
34+
If 'model' was a large object, computation was extremely slow
35+
or terminated with a message about 'deparse'.
36+
Fixed.
37+
38+
o plot.mppm
39+
If the fitted model 'x' was a large object, computation was extremely slow
40+
or terminated with a message about 'deparse'.
41+
Fixed.
42+
43+
o predict.ppm
44+
If 'new.coef' was given and the fitted model 'object' was a large object,
45+
computation was extremely slow, or terminated with message about 'deparse'.
2446
Fixed.
2547

2648
CHANGES IN spatstat.model VERSION 3.2-1

‎R/kppm.R‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# kluster/kox point process models
55
#
6-
# $Revision: 1.229 $ $Date: 2023/02/02 01:59:29 $
6+
# $Revision: 1.230 $ $Date: 2023/03/26 10:08:44 $
77
#
88

99
kppm <- function(X, ...) {
@@ -1145,8 +1145,8 @@ kppmPalmLik <- function(X, Xname, po, clusters, control=list(), stabilize=TRUE,
11451145
# stationary unmarked Poisson process
11461146
lambda <- intensity(X)
11471147
lambdaJ <- rep(lambda, length(J))
1148-
# compute cdf of distance between a uniform random point in W
1149-
# and a randomly-selected point in X
1148+
# compute cdf of distance between a randomly-selected point in X
1149+
# and a uniform random point in W
11501150
g <- distcdf(X, M, delta=rmax/4096)
11511151
# scaling constant is (integral of intensity) * (number of points)
11521152
gscale <- npoints(X)^2
@@ -1155,7 +1155,7 @@ kppmPalmLik <- function(X, Xname, po, clusters, control=list(), stabilize=TRUE,
11551155
lambdaX <- fitted(po, dataonly=TRUE)
11561156
lambda <- lambdaM <- predict(po, locations=M)
11571157
lambdaJ <- lambdaX[J]
1158-
# compute cdf of distance between a uniform random point in X
1158+
# compute cdf of distance between a randomly-selected point in X
11591159
# and a random point in W with density proportional to intensity function
11601160
g <- distcdf(X, M, dV=lambdaM, delta=rmax/4096)
11611161
# scaling constant is (integral of intensity) * (number of points)

‎inst/doc/packagesizes.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
44
"2023-01-26" "3.1-2" 267 706 0 38848 1155
55
"2023-02-14" "3.2-0" 269 709 0 38930 1155
66
"2023-02-15" "3.2-1" 269 709 0 38930 1155
7-
"2023-03-16" "3.2-1.007" 269 709 0 38944 1155
7+
"2023-04-21" "3.2-2" 269 709 0 38944 1155

‎man/macros/defns.Rd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
\newcommand{\Martin}{\ifelse{latex}{\out{Mart\'{\i}n}}{Martin}}
3333
\newcommand{\Dominguez}{\ifelse{latex}{\out{Dom\'{\i}nguez}}{Dominguez}}
3434
\newcommand{\Rodriguez}{\ifelse{latex}{\out{Rodr\'{\i}guez}}{Rodriguez}}
35+
\newcommand{\Gonzalez}{\ifelse{latex}{\out{Gonz\'{a}lez}}{Gonzalez}}
3536
%% List of all Gibbs interactions
3637
\newcommand{\GibbsInteractionsList}{\code{\link[spatstat.model]{AreaInter}}, \code{\link[spatstat.model]{BadGey}}, \code{\link[spatstat.model]{Concom}}, \code{\link[spatstat.model]{DiggleGatesStibbard}}, \code{\link[spatstat.model]{DiggleGratton}}, \code{\link[spatstat.model]{Fiksel}}, \code{\link[spatstat.model]{Geyer}}, \code{\link[spatstat.model]{Hardcore}}, \code{\link[spatstat.model]{HierHard}}, \code{\link[spatstat.model]{HierStrauss}}, \code{\link[spatstat.model]{HierStraussHard}}, \code{\link[spatstat.model]{Hybrid}}, \code{\link[spatstat.model]{LennardJones}}, \code{\link[spatstat.model]{MultiHard}}, \code{\link[spatstat.model]{MultiStrauss}}, \code{\link[spatstat.model]{MultiStraussHard}}, \code{\link[spatstat.model]{OrdThresh}}, \code{\link[spatstat.model]{Ord}}, \code{\link[spatstat.model]{Pairwise}}, \code{\link[spatstat.model]{PairPiece}}, \code{\link[spatstat.model]{Penttinen}}, \code{\link[spatstat.model]{Poisson}}, \code{\link[spatstat.model]{Saturated}}, \code{\link[spatstat.model]{SatPiece}}, \code{\link[spatstat.model]{Softcore}}, \code{\link[spatstat.model]{Strauss}}, \code{\link[spatstat.model]{StraussHard}} and \code{\link[spatstat.model]{Triplets}}}
3738
%% List of interactions recognised by RMH code

0 commit comments

Comments
 (0)