Skip to content

Commit

Permalink
version 2.0-8
Browse files Browse the repository at this point in the history
  • Loading branch information
Edith Gabriel authored and cran-robot committed Jun 29, 2024
1 parent c7e806a commit a46128e
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 77 deletions.
6 changes: 6 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
CHANGES IN stpp VERSION 2.0.8

* Updated dependency on spatstat

--------------------------------------------------------------------------------

CHANGES IN stpp VERSION 2.0.7

* Updated dependency on spatstat.explore
Expand Down
12 changes: 6 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Package: stpp
Version: 2.0-7
Date: 2022-11-29
Version: 2.0-8
Date: 2024-06-27
Title: Space-Time Point Pattern Simulation, Visualisation and Analysis
Authors@R: c(person("Edith", "Gabriel", role=c("aut","cre"), email="edith.gabriel@inrae.fr"),
person("Peter J", "Diggle", role="aut", email="p.diggle@lancaster.ac.uk"),
person("Barry", "Rowlingson",role="aut", email="b.rowlingson@lancaster.ac.uk"),
person("Francisco J", "Rodriguez-Cortes", role="aut", email="frrodriguezc@unal.edu.co"))
Maintainer: Edith Gabriel <edith.gabriel@inrae.fr>
Depends: R (>= 3.3.0), grDevices, graphics, rpanel, splancs
Imports: KernSmooth, ggplot2, gridExtra, plot3D, rgl, spatstat.explore,
spatstat.geom, spatstat.random, stats
Imports: KernSmooth, ggplot2, gridExtra, plot3D, rgl, spatstat.univar,
spatstat.explore, spatstat.geom, spatstat.random, stats
Suggests: knitr(>= 1.11), rmarkdown(>= 0.8.1)
Description: Many of the models encountered in applications of point process methods to the study of spatio-temporal phenomena are covered in 'stpp'. This package provides statistical tools for analyzing the global and local second-order properties of spatio-temporal point processes, including estimators of the space-time inhomogeneous K-function and pair correlation function. It also includes tools to get static and dynamic display of spatio-temporal point patterns. See Gabriel et al (2013) <doi:10.18637/jss.v053.i02>.
License: GPL-3
Expand All @@ -23,6 +23,6 @@ Author: Edith Gabriel [aut, cre],
Peter J Diggle [aut],
Barry Rowlingson [aut],
Francisco J Rodriguez-Cortes [aut]
Packaged: 2022-11-29 20:51:26 UTC; UNALMED
Packaged: 2024-06-27 21:26:09 UTC; UNALMED
Repository: CRAN
Date/Publication: 2022-11-30 11:00:02 UTC
Date/Publication: 2024-06-28 05:50:02 UTC
23 changes: 11 additions & 12 deletions MD5
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
3544c20a1b9dc2b9cab5ada2901de4b4 *CHANGES
94ccf82627858054bf27c44ca68e467e *DESCRIPTION
7954d1de323562ea124db3d51617855a *NAMESPACE
92956dcb75e0d96081f9141f0e7bbf56 *CHANGES
87de05841f6c483920340ca863613141 *DESCRIPTION
1a87fb262698e441448180a52b52a2cc *NAMESPACE
8984702e5ebbda91c34788a2002d3489 *R/ASTIKhat.R
c4ada538ed0f2a3ed3785fb209895324 *R/KLISTAhat.R
d71fa23f23a27def620f6e8f8c634e83 *R/LISTAhat.R
Expand All @@ -11,7 +11,7 @@ b101f394ca9bdfe153b11fbb7acc81b5 *R/PCFhat.R
f27bd1b5dc1c4a09a155ae8a291f1c07 *R/gsp.R
f97b14716314a9c9bbb3f3753156037f *R/gte.R
57ca06e899a009e0d28f1ca300b12849 *R/is.3dpoints.R
26ab622e7303c3a60f91c39b8ef9156b *R/kmmr.R
34c103f769a38d007490e969d62f8e7d *R/kmmr.R
ba2555320efcad9f97bc8e0dc775a154 *R/kmmt.R
3f290e7b850abc21d0a3225646439f9a *R/kmr.R
4754659d6268ee5bfbbf0491e6d12ce3 *R/kmt.R
Expand All @@ -27,12 +27,11 @@ b16363917ba159a3ad7f6c51ea6787a6 *R/rpcp.R
2331863ded1c6c1a3d486775ed7ea423 *R/stan.R
44256f66abbe1e947cc214cf8a965d5b *R/stdcpp.R
b3179e871190011832aea580bd2d6472 *R/sthpcpp.R
0af6f9f9f70f4ea4e7d58ea7ca1cf60c *README.md
c0157aeaece6cd20d37cf4df28357b54 *build/vignette.rds
0cc98548db46eac084b623660a4416f0 *data/fmd.rda
048e5d79ba4e0df18438dfdbfb5c0d1a *data/northcumbria.rda
4b62cd63a8b3ec6f390baaee16dbc5bd *inst/doc/docs.Rmd
85b6906d03a07b884554498038d5a351 *inst/doc/docs.html
94ca749857f1b9e01957cac8eca621e2 *build/vignette.rds
36365eee84df24c82514cef55f528230 *data/fmd.rda
b23602544c6a96a6a6f429300832c1d3 *data/northcumbria.rda
0a21e0561fd30a886030ddc3786f5297 *inst/doc/docs.Rmd
5f532e40204ce63098f149713caaa5a8 *inst/doc/docs.html
134fc0a66423eb55b5d7218b5e85d5aa *man/ASTIKhat.Rd
65058fd7bbc9ca0f0796d81ba790ec59 *man/KLISTAhat.Rd
6fd8b67bc8e0bd75bc7d630298521064 *man/LISTAhat.Rd
Expand Down Expand Up @@ -71,7 +70,7 @@ beb05a54bcf0b421ff9dab3bca5617e7 *src/gtecore.f
c2c3fdc451bfba69983e1aefc72f31f5 *src/gtecoreinh.f
c170d78c4ad2b459e0801ae0a2bca079 *src/init.c
ddb108373a211b5192574df85c42f17d *src/klistafunction.f
c65baf8639ad11c7f363831892e22368 *src/kmmrcore.f
243747e75d8b93f9db4fbbfe89ca1c7a *src/kmmrcore.f
9648a60ea1907b0218d7005391390dc4 *src/kmmrcoreinh.f
10aa88ef1d38f2c4f722d35b73c646ae *src/kmmtcore.f
81c7bd27a82bcb11ccbf145b597f3669 *src/kmmtcoreinh.f
Expand All @@ -82,4 +81,4 @@ f0aec40ffdfd6be7037bf541c5e93ad8 *src/kmrcore.f
b09b18d00a172c26e951441d0f7a7a47 *src/listafunction.f
04ee26f7ef87a29b03a7a20a802c7423 *src/pcffunction.f
fc387401adb7bff62fb73d74ffc35a92 *src/stikfunction.f
4b62cd63a8b3ec6f390baaee16dbc5bd *vignettes/docs.Rmd
0a21e0561fd30a886030ddc3786f5297 *vignettes/docs.Rmd
3 changes: 2 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ importFrom("graphics","axTicks","axis","box","contour","image","par","persp","pl
importFrom("stats","dnorm","fft","median","rexp","rnorm","rpois","runif","time","dist")
importFrom("rgl","par3d","rotationMatrix","surface3d","plot3d","axis3d","aspect3d","rgl.pop","lines3d","segments3d","points3d","spheres3d")
importFrom("spatstat.explore","edge.Trans","bw.stoyan","edge.Ripley")
importFrom("spatstat.geom","as.im","verifyclass","owin","as.rectangle","make.even.breaks","inside.owin","ppp","bdist.points","eroded.areas","area","pairdist","perimeter")
importFrom("spatstat.geom","as.im","verifyclass","owin","as.rectangle","inside.owin","ppp","bdist.points","eroded.areas","area","pairdist","perimeter")
importFrom("spatstat.univar","make.even.breaks")
importFrom("spatstat.random","rMatClust")
importFrom("KernSmooth","dpik")
importFrom("plot3D","scatter3D")
Expand Down
8 changes: 4 additions & 4 deletions R/kmmr.R
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ kmmr <- function(xyt,s.region,s.lambda,ds,ks="epanech",hs,correction="none",appr
kmmrtheo <- 1
npt <- pxy$n[1]
nds <- length(ds)
mummr <- mean(ptst)
cmm <- ((range(ptst)[2]-range(ptst)[1])/2)^2
ekmmr <- rep(0,nds)

storage.mode(ekmmr) <- "double"
Expand All @@ -96,7 +96,7 @@ kmmr <- function(xyt,s.region,s.lambda,ds,ks="epanech",hs,correction="none",appr
as.integer(npt),as.double(ds),as.integer(nds),as.integer(ker2)
,as.double(hs),(ekmmr))

ekmmr <- kmmrout[[9]]/(mummr^2)
ekmmr <- kmmrout[[9]]/cmm

invisible(return(list(ekmmr=ekmmr,ds=ds,kernel=kernel,kmmrtheo=kmmrtheo)))
} else {
Expand Down Expand Up @@ -156,8 +156,8 @@ kmmr <- function(xyt,s.region,s.lambda,ds,ks="epanech",hs,correction="none",appr
as.double(wbi),as.double(wbimod),as.double(wss),as.integer(correc2),
(ekmmr))

ekmmr <- kmmrout[[16]]/(mummr^2)
ekmmr <- kmmrout[[16]]/cmm

invisible(return(list(ekmmr=ekmmr,ds=ds,kernel=kernel,kmmrtheo=kmmrtheo,s.lambda=s.lambda)))
}
}
}
45 changes: 0 additions & 45 deletions README.md

This file was deleted.

Binary file modified build/vignette.rds
Binary file not shown.
Binary file modified data/fmd.rda
Binary file not shown.
Binary file modified data/northcumbria.rda
Binary file not shown.
4 changes: 2 additions & 2 deletions inst/doc/docs.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Many of the models encountered in applications of point process methods to the s

- [Chan, G. and Wood A. (1997). An algorithm for simulating stationary Gaussian random fields. *Applied Statistics, Algorithm Section*, **46**, 171–181.](https://rss.onlinelibrary.wiley.com/doi/abs/10.1111/1467-9876.00057)

- [Chan, G. and Wood A. (1999). Simulation of stationary Gaussian vector fields. *Statistics and Computing*, **9**, 265–268.](https://link.springer.com/article/10.1023/A:1008903804954/)
- [Chan, G. and Wood A. (1999). Simulation of stationary Gaussian vector fields. *Statistics and Computing*, **9**, 265–268.](https://link.springer.com/article/10.1023/A:1008903804954)

- [Diggle P. , Chedwynd A., Haggkvist R. and Morris S. (1995). Second-order analysis of space-time clustering. *Statistical Methods in Medical Research*, **4**, 124–136.](https://journals.sagepub.com/doi/abs/10.1177/096228029500400203/)

Expand All @@ -29,7 +29,7 @@ Many of the models encountered in applications of point process methods to the s

- [Gabriel E., Diggle P. (2009). Second-order analysis of inhomogeneous spatio-temporal point process data. *Statistica Neerlandica*, *63*, 43–51.](https://onlinelibrary.wiley.com/doi/abs/10.1111/j.1467-9574.2008.00407.x)

- [Gabriel E. (2014). Estimating second-order characteristics of inhomogeneous spatio-temporal point processes: influence ofedge correction methods and intensity estimates. *Methodology and computing in Applied Probabillity*, **16**(2), 411–431.](https://link.springer.com/article/10.1007/s11009-013-9358-3/)
- [Gabriel E. (2014). Estimating second-order characteristics of inhomogeneous spatio-temporal point processes: influence ofedge correction methods and intensity estimates. *Methodology and computing in Applied Probabillity*, **16**(2), 411–431.](https://link.springer.com/article/10.1007/s11009-013-9358-3)

- [Gneiting T. (2002). Nonseparable, stationary covariance functions for space-time data. *Journal of the American Statistical Association*, **97**, 590–600.](https://www.tandfonline.com/doi/abs/10.1198/016214502760047113)

Expand Down
8 changes: 4 additions & 4 deletions inst/doc/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<meta name="author" content="Edith Gabriel, Peter J Diggle, Barry Rowlingson and Francisco J Rodriguez-Cortes" />

<meta name="date" content="2022-11-29" />
<meta name="date" content="2024-06-27" />

<title>stpp Documentation</title>

Expand Down Expand Up @@ -242,7 +242,7 @@ <h3 class="subtitle">Space-Time Point Pattern Simulation, Visualisation
and Analysis</h3>
<h4 class="author">Edith Gabriel, Peter J Diggle, Barry Rowlingson and
Francisco J Rodriguez-Cortes</h4>
<h4 class="date">2022-11-29</h4>
<h4 class="date">2024-06-27</h4>



Expand All @@ -263,7 +263,7 @@ <h3>References</h3>
G. and Wood A. (1997). An algorithm for simulating stationary Gaussian
random fields. <em>Applied Statistics, Algorithm Section</em>,
<strong>46</strong>, 171–181.</a></p></li>
<li><p><a href="https://link.springer.com/article/10.1023/A:1008903804954/">Chan,
<li><p><a href="https://link.springer.com/article/10.1023/A:1008903804954">Chan,
G. and Wood A. (1999). Simulation of stationary Gaussian vector fields.
<em>Statistics and Computing</em>, <strong>9</strong>,
265–268.</a></p></li>
Expand All @@ -282,7 +282,7 @@ <h3>References</h3>
E., Diggle P. (2009). Second-order analysis of inhomogeneous
spatio-temporal point process data. <em>Statistica Neerlandica</em>,
<em>63</em>, 43–51.</a></p></li>
<li><p><a href="https://link.springer.com/article/10.1007/s11009-013-9358-3/">Gabriel
<li><p><a href="https://link.springer.com/article/10.1007/s11009-013-9358-3">Gabriel
E. (2014). Estimating second-order characteristics of inhomogeneous
spatio-temporal point processes: influence ofedge correction methods and
intensity estimates. <em>Methodology and computing in Applied
Expand Down
2 changes: 1 addition & 1 deletion src/kmmrcore.f
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ subroutine kmmrcore(x,y,txy,n,s,ns,ks,hs,kmmr)
do j=1,n
if (j.ne.i) then
hij=sqrt(((xi-x(j))**two)+((yi-y(j))**two))
mij=ti*txy(j)
mij=abs(ti*txy(j))
if (ks(1).eq.1) then
kerns=boxkernel((s(iu)-hij)/hs,hs)
else if (ks(2).eq.1) then
Expand Down
4 changes: 2 additions & 2 deletions vignettes/docs.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Many of the models encountered in applications of point process methods to the s

- [Chan, G. and Wood A. (1997). An algorithm for simulating stationary Gaussian random fields. *Applied Statistics, Algorithm Section*, **46**, 171–181.](https://rss.onlinelibrary.wiley.com/doi/abs/10.1111/1467-9876.00057)

- [Chan, G. and Wood A. (1999). Simulation of stationary Gaussian vector fields. *Statistics and Computing*, **9**, 265–268.](https://link.springer.com/article/10.1023/A:1008903804954/)
- [Chan, G. and Wood A. (1999). Simulation of stationary Gaussian vector fields. *Statistics and Computing*, **9**, 265–268.](https://link.springer.com/article/10.1023/A:1008903804954)

- [Diggle P. , Chedwynd A., Haggkvist R. and Morris S. (1995). Second-order analysis of space-time clustering. *Statistical Methods in Medical Research*, **4**, 124–136.](https://journals.sagepub.com/doi/abs/10.1177/096228029500400203/)

Expand All @@ -29,7 +29,7 @@ Many of the models encountered in applications of point process methods to the s

- [Gabriel E., Diggle P. (2009). Second-order analysis of inhomogeneous spatio-temporal point process data. *Statistica Neerlandica*, *63*, 43–51.](https://onlinelibrary.wiley.com/doi/abs/10.1111/j.1467-9574.2008.00407.x)

- [Gabriel E. (2014). Estimating second-order characteristics of inhomogeneous spatio-temporal point processes: influence ofedge correction methods and intensity estimates. *Methodology and computing in Applied Probabillity*, **16**(2), 411–431.](https://link.springer.com/article/10.1007/s11009-013-9358-3/)
- [Gabriel E. (2014). Estimating second-order characteristics of inhomogeneous spatio-temporal point processes: influence ofedge correction methods and intensity estimates. *Methodology and computing in Applied Probabillity*, **16**(2), 411–431.](https://link.springer.com/article/10.1007/s11009-013-9358-3)

- [Gneiting T. (2002). Nonseparable, stationary covariance functions for space-time data. *Journal of the American Statistical Association*, **97**, 590–600.](https://www.tandfonline.com/doi/abs/10.1198/016214502760047113)

Expand Down

0 comments on commit a46128e

Please sign in to comment.