Internal streamlining

Author: baddstats

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: spatstat.linnet
-Version: 3.4-0.015
+Version: 3.4-0.016
 Date: 2026-01-01
 Title: Linear Networks Functionality of the 'spatstat' Family
 Authors@R: c(person("Adrian", "Baddeley", 
@@ -25,7 +25,7 @@ Authors@R: c(person("Adrian", "Baddeley",
 	     person("Ottmar", "Cronie",
 	            role = "ctb"))
 Maintainer: Adrian Baddeley <[email protected]>
-Depends: R (>= 3.5.0), stats, graphics, grDevices, methods, utils, spatstat.data (>= 3.1-9), spatstat.univar (>= 3.1-5), spatstat.geom (>= 3.6-1.008), spatstat.random (>= 3.4-3), spatstat.explore (>= 3.6-0), spatstat.model (>= 3.5-0.012)
+Depends: R (>= 3.5.0), stats, graphics, grDevices, methods, utils, spatstat.data (>= 3.1-9), spatstat.univar (>= 3.1-5), spatstat.geom (>= 3.6-1.022), spatstat.random (>= 3.4-3), spatstat.explore (>= 3.6-0), spatstat.model (>= 3.5-0.012)
 Imports: Matrix, spatstat.utils (>= 3.1-5), spatstat.sparse (>= 3.1)
 Suggests: goftest, locfit, spatstat (>= 3.4)
 Description: Defines types of spatial data on a linear network

NEWS

@@ -1,5 +1,5 @@
 
-        CHANGES IN spatstat.linnet VERSION 3.4-0.015
+        CHANGES IN spatstat.linnet VERSION 3.4-0.016
 
 OVERVIEW
 

R/linnet.R

@@ -689,8 +689,7 @@ connected.linnet <- function(X, ..., what=c("labels", "components")) {
   verifyclass(X, "linnet")
   what <- match.arg(what)
   nv <- npoints(vertices(X))
-  lab0 <- cocoEngine(nv, X$from - 1L, X$to - 1L, "connected.linnet")
-  lab <- lab0 + 1L
+  lab <- cocoLabels(nv, X$from, X$to, "connected.linnet")
   lab <- factor(as.integer(factor(lab)))
   if(what == "labels")
     return(lab)
@@ -776,7 +775,7 @@ identify.linnet <- function(x, ...) {
   identify(as.psp(x), ...)
 }
 
-roadways <- function(X, what=c("labels", "segments", "function")) {
+roadways <- function(X, what=c("labels", "segments", "tessellation", "function")) {
   verifyclass(X, "linnet")
   what <- match.arg(what)
   ## identify which vertices are just a 'bend' in the road
@@ -789,19 +788,16 @@ roadways <- function(X, what=c("labels", "segments", "function")) {
   ok <- bend[ver]
   seg <- seg[ok]
   ver <- ver[ok]
-  ## match (segment, vertex) pairs with the same vertex
+  ## match (segment, vertex) pairs which have the same vertex
   second <- which(duplicated(ver))
   first <- uniquemap(ver)[second]
   ## extract corresponding edges
   a <- seg[first]
   b <- seg[second]
   ## Thus edges a[j], b[j] share a common vertex of degree 2, for each j
   ## Identify equivalence classes
-  lab0 <- cocoEngine(nsegments(X), a - 1L, b - 1L, "roadways algorithm")
-  ## renumber sequentially
-  lab <- as.integer(factor(lab0))
-  # Convert labels to factor
-  lab <- factor(lab)
+  lab <- cocoLabels(nsegments(X), a, b, "roadways algorithm")
+  lab <- as.factor(lab)
   ##
   switch(what,
          labels = {
@@ -810,6 +806,13 @@ roadways <- function(X, what=c("labels", "segments", "function")) {
          segments = {
            result <- as.psp(X) %mark% lab
          },
+         tessellation = {
+           df <- data.frame(seg=seq_len(nsegments(X)),
+                            t0=0,
+                            t1=1,
+                            tile=lab)
+           result <- lintess(X, df)
+         },
          "function" = {
            f <- function(x,y,seg,tp, ...) { lab[seg] }
            result <- linfun(f, X)

R/lintessmakers.R

@@ -4,7 +4,7 @@
 #'   Creation of linear tessellations
 #'   and intersections between lintess objects
 #'
-#'   $Revision: 1.13 $  $Date: 2025/11/27 07:50:47 $
+#'   $Revision: 1.14 $  $Date: 2026/01/01 08:00:42 $
 #' 
 
 divide.linnet <- local({
@@ -48,8 +48,7 @@ divide.linnet <- local({
         iedge <- c(iedge, joined[-njoin])
       jedge <- c(jedge, joined[-1L])
     }
-    lab0 <- cocoEngine(nbits, iedge - 1L, jedge - 1L)
-    lab <- lab0 + 1L
+    lab <- cocoLabels(nbits, iedge, jedge, "divide.linnet")
     lab <- as.integer(factor(lab))
     df <- df[,c("seg", "t0", "t1")]
     df$tile <- lab

R/lpp.R

@@ -685,8 +685,7 @@ connected.lpp <- function(X, R=Inf, ..., dismantle=TRUE) {
     close <- (pairdist(X) <= R)
     diag(close) <- FALSE
     ij <- which(close, arr.ind=TRUE)
-    lab0 <- cocoEngine(nv, ij[,1] - 1L, ij[,2] - 1L, "connected.lpp")
-    lab <- lab0 + 1L
+    lab <- cocoLabels(nv, ij[,1], ij[,2], "connected.lpp")
     # Renumber labels sequentially 
     lab <- as.integer(factor(lab))
     # Convert labels to factor

inst/doc/packagesizes.txt

@@ -42,4 +42,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2025-07-24" "3.3-1" 150 328 0 13326 3270
 "2025-09-24" "3.3-2" 150 328 0 13356 3270
 "2025-11-29" "3.4-0" 160 370 0 14990 3270
-"2026-01-01" "3.4-0.015" 161 373 0 15477 3270
+"2026-01-01" "3.4-0.016" 161 373 0 15478 3270

inst/info/packagesizes.txt

@@ -42,4 +42,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2025-07-24" "3.3-1" 150 328 0 13326 3270
 "2025-09-24" "3.3-2" 150 328 0 13356 3270
 "2025-11-29" "3.4-0" 160 370 0 14990 3270
-"2026-01-01" "3.4-0.015" 161 373 0 15477 3270
+"2026-01-01" "3.4-0.016" 161 373 0 15478 3270

man/roadways.Rd

@@ -9,7 +9,7 @@
   any forks in the network.
 }
 \usage{
-roadways(X, what = c("labels", "segments", "function"))
+roadways(X, what = c("labels", "segments", "tessellation", "function"))
 }
 \arguments{
   \item{X}{
@@ -47,14 +47,20 @@ roadways(X, what = c("labels", "segments", "function"))
   it belongs to. If \code{what="labels"} (the default), the result is a
   factor of length equal to \code{nsegments(X)} giving the
   classification of segments. If \code{what="segments"}, the result is
-  a line segment pattern (object of class \code{"psp"}) with marks
-  indicating the classification. If \code{what="function"}, the result
+  a line segment pattern (object of class \code{"psp"}) with
+  factor-valued marks indicating the classification of segments.
+  If \code{what="tessellation"}, the result is a tessellation of
+  \code{X} (object of class \code{"lintess"}) in which the tiles of the
+  tessellation are the roadways.
+  If \code{what="function"}, the result
   is a function of class \code{"linfun"} which can be applied to any
-  location on the network to determine which roadway it belongs to.
+  location on the network and returns a categorical value
+  indicating which roadway the location belongs to.
 }
 \value{
-  A factor, or an object of class \code{"psp"}, or a function
-  of class \code{"linfun"}.
+  A factor, or an object of class \code{"psp"},
+  a tessellation of class \code{"lintess"},
+  or a function of class \code{"linfun"}.
 }
 \author{
   \adrian