model.images recognises dimyx etc

Author: baddstats

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: spatstat.model
-Version: 3.3-2.004
-Date: 2024-10-01
+Version: 3.3-2.005
+Date: 2024-10-06
 Title: Parametric Statistical Modelling and Inference for the 'spatstat' Family
 Authors@R: c(person("Adrian", "Baddeley", 
                     role = c("aut", "cre", "cph"),
@@ -55,7 +55,7 @@ Authors@R: c(person("Adrian", "Baddeley",
 	     person("Hangsheng", "Wang",
 	            role = "ctb"))
 Maintainer: Adrian Baddeley <[email protected]>
-Depends: R (>= 3.5.0),  spatstat.data (>= 3.0-4), spatstat.univar (>= 3.0-0), spatstat.geom (>= 3.3-0), spatstat.random (>= 3.3-0), spatstat.explore (>= 3.3-0), stats, graphics, grDevices, utils, methods, nlme, rpart
+Depends: R (>= 3.5.0),  spatstat.data (>= 3.0-4), spatstat.univar (>= 3.0-0), spatstat.geom (>= 3.3-3.002), spatstat.random (>= 3.3-0), spatstat.explore (>= 3.3-0), stats, graphics, grDevices, utils, methods, nlme, rpart
 Imports: spatstat.utils (>= 3.0-5), spatstat.sparse (>= 3.1-0),mgcv, Matrix, abind, tensor, goftest (>= 1.2-2)
 Suggests: sm, gsl, locfit, spatial, fftwtools (>= 0.9-8), nleqslv, glmnet, spatstat.linnet (>= 3.1-5), spatstat (>= 3.0-8)
 Description: Functionality for parametric statistical modelling and inference for spatial data,

NEWS

@@ -1,10 +1,16 @@
 
-        CHANGES IN spatstat.model VERSION 3.3-2.004
+        CHANGES IN spatstat.model VERSION 3.3-2.005
 
 OVERVIEW
 
-    o Bug fixes.
+    o Bug fixes and minor improvements.
 
+SIGNIFICANT USER-VISIBLE CHANGES
+
+    o model.images.ppm
+    Now recognises arguments passed to 'as.mask'
+    to control the pixel raster for the images.
+    
 BUG FIXES
 
     o improve.kppm

R/ppmclass.R

@@ -4,7 +4,7 @@
 #	Class 'ppm' representing fitted point process models.
 #
 #
-#	$Revision: 2.157 $	$Date: 2024/09/30 05:36:11 $
+#	$Revision: 2.159 $	$Date: 2024/10/06 10:32:04 $
 #
 #       An object of class 'ppm' contains the following:
 #
@@ -802,7 +802,10 @@ PPMmodelmatrix <- function(object,
                            data = NULL, 
                            ...,
                            subset, Q=NULL, keepNA=TRUE, irregular=FALSE,
-                           splitInf=FALSE) {
+                           splitInf=FALSE,
+                           eps=NULL, dimyx=NULL, xy=NULL, rule.eps=NULL) {
+  ## trap pixel resolution arguments - not used 
+  dont.complain.about(eps, dimyx, xy, rule.eps)
   # handles ppm and ippm			      
   data.given <- !is.null(data)
   irregular <- irregular && inherits(object, "ippm") && !is.null(object$iScore)
@@ -966,9 +969,9 @@ model.images.ppm <- function(object, W=as.owin(object), ...) {
   X <- data.ppm(object)
 #  irregular <- resolve.1.default(list(irregular=FALSE), list(...))
   ## make a quadscheme with a dummy point at every pixel
-  Q <- pixelquad(X, W)
+  Q <- pixelquad(X, W, ...)  # recognises dimyx etc
   ## compute model matrix
-  mm <- model.matrix(object, Q=Q, ...)
+  mm <- model.matrix(object, Q=Q, ...) # ignores dimyx etc
   ## retain only the entries for dummy points (pixels)
   mm <- mm[!is.data(Q), , drop=FALSE]
   mm <- as.data.frame(mm)

inst/doc/packagesizes.txt

@@ -15,4 +15,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2024-02-02" "3.2-10" 269 724 0 39028 1155
 "2024-03-22" "3.2-11" 269 724 0 39028 1155
 "2024-07-09" "3.3-1" 269 726 0 39051 1155
-"2024-10-01" "3.3-2.004" 269 726 0 39063 1155
+"2024-10-06" "3.3-2.005" 269 726 0 39066 1155

inst/info/packagesizes.txt

@@ -15,4 +15,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2024-02-02" "3.2-10" 269 724 0 39028 1155
 "2024-03-22" "3.2-11" 269 724 0 39028 1155
 "2024-07-09" "3.3-1" 269 726 0 39051 1155
-"2024-10-01" "3.3-2.004" 269 726 0 39063 1155
+"2024-10-06" "3.3-2.005" 269 726 0 39066 1155

man/spatstat.model-internal.Rd

@@ -436,7 +436,7 @@ PoisSaddleArea(beta, fi)
 PoisSaddleGeyer(beta, fi)
 PoisSaddlePairwise(beta, fi)
 PPMmodelmatrix(object, data, \dots, subset, Q, keepNA, irregular,
-               splitInf)
+               splitInf, eps, dimyx, xy, rule.eps)
 \method{ppm}{default}(Q, trend, interaction,
        \dots, covariates, data, covfunargs, subset, clipwin,
        correction, rbord, use.gam, method, forcefit,