Ready for CRAN

Author: baddstats

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: spatstat.model
-Version: 3.3-5.002
-Date: 2025-04-19
+Version: 3.3-6
+Date: 2025-04-22
 Title: Parametric Statistical Modelling and Inference for the 'spatstat' Family
 Authors@R: c(person("Adrian", "Baddeley", 
                     role = c("aut", "cre", "cph"),

NAMESPACE

@@ -94,6 +94,7 @@ export("closepaircounts")
 export("clusterfield.kppm")
 export("clusterfit")
 export("clusterkernel.kppm")
+export("clusterkernel.zclustermodel")
 export("clusterradius.kppm")
 export("clusterradius.zclustermodel")
 export("coef.dppm")
@@ -794,6 +795,7 @@ S3method("cdf.test", "ppm")
 S3method("cdf.test", "slrm")
   S3method("clusterfield", "kppm")
 S3method("clusterkernel", "kppm")
+S3method("clusterkernel", "zclustermodel")
 S3method("clusterradius", "kppm")
  S3method("clusterradius", "zclustermodel")
 S3method("coef", "dppm")

NEWS

@@ -1,5 +1,5 @@
 
-        CHANGES IN spatstat.model VERSION 3.3-5.002
+        CHANGES IN spatstat.model VERSION 3.3-6
 
 OVERVIEW
 

R/clusterprocess.R

@@ -1,7 +1,7 @@
 #'
 #'   clusterprocess.R
 #'
-#'   $Revision: 1.1 $ $Date: 2025/04/19 05:17:27 $
+#'   $Revision: 1.2 $ $Date: 2025/05/16 07:14:33 $
 #'
 
 #' clusterprocess() is defined in spatstat.random

R/simulatekppm.R

@@ -3,7 +3,7 @@
 #'
 #'    simulate.kppm
 #'
-#'    $Revision: 1.13 $ $Date: 2025/04/19 05:23:43 $
+#'    $Revision: 1.14 $ $Date: 2025/05/22 05:25:49 $
 
 simulate.kppm <- function(object, nsim=1, seed=NULL, ...,
                           window=NULL, covariates=NULL,
@@ -40,7 +40,7 @@ simulate.kppm <- function(object, nsim=1, seed=NULL, ...,
   ## conditional simulation 
   if(!is.null(n.cond)) {
     ## fixed number of points
-    out <- condSimCox(object, nsim=nsim, seed=NULL, ..., 
+    out <- CondSimCox(object, nsim=nsim, seed=NULL, ..., 
                       win=win, covariates=covariates, 
                       n.cond=n.cond, w.cond=w.cond,
                       verbose=verbose, retry=retry, drop=drop)

R/zclustermodel.R

@@ -3,7 +3,7 @@
 #'
 #' Experimental
 #' 
-#'   $Revision: 1.12 $ $Date: 2025/04/18 08:13:38 $
+#'   $Revision: 1.13 $ $Date: 2025/05/16 07:14:43 $
 #'
 
 zclustermodel <- function(name="Thomas", ..., mu, kappa, scale) {
@@ -146,6 +146,16 @@ simulate.zclustermodel <- function(object, nsim=1, ..., win=unit.square()) {
          )})
 }
 
+clusterkernel.zclustermodel <- function(model, ...) {
+  info <- spatstatClusterModelInfo(model$name)
+  k <- info$kernel
+  par <- model$par.std
+  clustargs <- model$clustargs
+  f <- function(x, y=0, ...) { k(par, sqrt(x^2+y^2), margs=clustargs) }  
+  return(f)
+}
+
+
 #' The following methods are for generics defined in spatstat.model
 
 is.poissonclusterprocess.zclustermodel <- function(model) { TRUE }

inst/doc/packagesizes.txt

@@ -19,4 +19,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2024-11-19" "3.3-3" 269 726 0 39066 1155
 "2025-01-20" "3.3-4" 269 726 0 39070 1155
 "2025-03-22" "3.3-5" 269 726 0 39076 1155
-"2025-04-19" "3.3-5.002" 269 729 0 39061 1155
+"2025-04-22" "3.3-6" 269 730 0 39071 1155

inst/info/packagesizes.txt

@@ -19,4 +19,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2024-11-19" "3.3-3" 269 726 0 39066 1155
 "2025-01-20" "3.3-4" 269 726 0 39070 1155
 "2025-03-22" "3.3-5" 269 726 0 39076 1155
-"2025-04-19" "3.3-5.002" 269 729 0 39061 1155
+"2025-04-22" "3.3-6" 269 730 0 39071 1155

man/spatstat.model-internal.Rd

@@ -13,6 +13,7 @@
 \alias{bt.frame}
 \alias{cannot.update}
 \alias{check.separable}
+\alias{clusterkernel.zclustermodel}
 \alias{coef.summary.kppm}
 \alias{coef.summary.ppm}
 \alias{coef.summary.slrm}
@@ -258,6 +259,7 @@ bt.frame(Q, trend, interaction, \dots, covariates,
 bigvaluerule(objfun, objargs, startpar, \dots)
 cannot.update(\dots)
 check.separable(dmat, covname, isconstant, fatal)
+\method{clusterkernel}{zclustermodel}(model, \dots)
 \method{coef}{summary.kppm}(object, \dots)
 \method{coef}{summary.ppm}(object, \dots)
 \method{coef}{summary.slrm}(object, \dots)