Ready for CRAN

Author: baddstats

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: spatstat.utils
-Version: 3.2-2.006
-Date: 2026-05-07
+Version: 3.2-3
+Date: 2026-05-10
 Title: Utility Functions for 'spatstat'
 Authors@R: c(person("Adrian", "Baddeley", 
                     role = c("aut", "cre"),

NEWS

@@ -1,5 +1,5 @@
 
-        CHANGES IN spatstat.utils VERSION 3.2-2.006
+        CHANGES IN spatstat.utils VERSION 3.2-3
 
 OVERVIEW
 

R/distppll.R

@@ -2,7 +2,7 @@
 #'      distppll.R
 #'                 (formerly 'xysegment.R')
 #'
-#'     $Revision: 1.24 $    $Date: 2026/05/07 05:08:01 $
+#'     $Revision: 1.26 $    $Date: 2026/05/10 03:56:17 $
 #'
 #' Low level utilities for analytic geometry for line segments
 #'
@@ -22,10 +22,11 @@
 #'       distances from each of a list of points p[i,]
 #'       to each of a list of line segments l[i,] 
 #'       [interpreted code uses large matrices and 'outer()']
-#'       [Fortran implementation included!]
+#'       [Partial C implementation included!]
 #'
 #' NNdist2segs
 #'       distance to nearest line segment, from each point in a list.
+#'       Efficient C code used.
 #'
 #' Copyright (c) Adrian Baddeley and Rob Foxall 1997-2026
 #' GNU Public Licence (>= 2.0)
@@ -51,10 +52,11 @@ distpl <- function(p, l) {
   si <- dy/leng
   #' back-rotated coords of p
   xpr <- co * xpl + si * ypl
-  ypr <-  - si * xpl + co * ypl
-  #' test
-  if(xpr >= 0 && xpr <= leng)
+  ## ypr <-  - si * xpl + co * ypl
+  if(xpr >= 0 && xpr <= leng) {
+    ypr <- - si * xpl + co * ypl
     dmin <- min(dmin, abs(ypr))
+  }
   return(dmin)
 }
 
@@ -79,13 +81,14 @@ distppl <- function(p, l) {
   si <- dy/leng
   #' back-rotated coords of p
   xpr <- co * xpl + si * ypl
-  ypr <-  - si * xpl + co * ypl
+  ## ypr <-  - si * xpl + co * ypl
   #' ypr is perpendicular distance to infinite line
   #' Applies only when xp, yp in the middle
   middle <- (xpr >= 0 & xpr <= leng)
-  if(any(middle))
+  if(any(middle)) {
+    ypr <-  - si * xpl + co * ypl
     dmin[middle] <- pmin.int(dmin[middle], abs(ypr[middle]))
-  
+  }
   return(dmin)
 }
 
@@ -173,19 +176,25 @@ distppll <- function(p, l, mintype=0,
 #' (distance to) nearest segment 
 
 distppllmin <- function(p, l, big=NULL) {
+  ## find distance from each point to nearest segment
+  ## and identifier of nearest segment
   if(is.null(big)) {
     xdif <- diff(range(c(p[,1],l[, c(1,3)])))
     ydif <- diff(range(c(p[,2],l[, c(2,4)])))
     big <- 2 * (xdif^2 + ydif^2)
   }
   z <- NNdist2segments(p[,1], p[,2],
                        l[,1], l[,2], l[,3], l[,4],
-                       big)
+                       bigvalue=big,
+                       wantindex=TRUE, wantproj=FALSE)
   return(list(min.d=sqrt(z$dist2), min.which=z$index))
 }
 
 NNdist2segments <- function(xp, yp, x0, y0, x1, y1, bigvalue,
                             wantindex=TRUE, wantproj=FALSE) {
+  ## find distance from each point to nearest segment
+  ## If 'wantindex' then also return index of segment  
+  ## If 'wantproj' then also return (x,y) and (tp) coordinates of projection
   np <- length(xp)
   ns <- length(x0)
   dist2 <- rep(bigvalue, np)

inst/doc/packagesizes.txt

@@ -33,4 +33,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2025-09-20" "3.2-0" 42 195 0 3716 2462
 "2026-01-08" "3.2-1" 43 196 0 3754 2535
 "2026-03-10" "3.2-2" 44 197 0 3778 2535
-"2026-05-07" "3.2-2.006" 44 197 0 3808 2683
+"2026-05-10" "3.2-3" 44 197 0 3817 2683

inst/info/packagesizes.txt

@@ -33,4 +33,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2025-09-20" "3.2-0" 42 195 0 3716 2462
 "2026-01-08" "3.2-1" 43 196 0 3754 2535
 "2026-03-10" "3.2-2" 44 197 0 3778 2535
-"2026-05-07" "3.2-2.006" 44 197 0 3808 2683
+"2026-05-10" "3.2-3" 44 197 0 3817 2683