diff --git a/DESCRIPTION b/DESCRIPTION index 919d3cc..1d1050f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: spatstat.linnet -Version: 3.1-4.001 -Date: 2024-02-05 +Version: 3.1-5 +Date: 2024-03-24 Title: Linear Networks Functionality of the 'spatstat' Family Authors@R: c(person("Adrian", "Baddeley", role = c("aut", "cre", "cph"), @@ -25,8 +25,8 @@ Authors@R: c(person("Adrian", "Baddeley", person("Ottmar", "Cronie", role = "ctb")) Maintainer: Adrian Baddeley -Depends: R (>= 3.5.0), spatstat.data (>= 3.0), spatstat.geom (>= 3.2-7), spatstat.random (>= 3.2-1), spatstat.explore (>= 3.2-5), spatstat.model (>= 3.2-9), stats, graphics, grDevices, methods, utils -Imports: spatstat.utils (>= 3.0-3), Matrix, spatstat.sparse (>= 3.0) +Depends: R (>= 3.5.0), spatstat.data (>= 3.0-4), spatstat.geom (>= 3.2-9), spatstat.random (>= 3.2-3), spatstat.explore (>= 3.2-7), spatstat.model (>= 3.2-11), stats, graphics, grDevices, methods, utils +Imports: spatstat.utils (>= 3.0-4), Matrix, spatstat.sparse (>= 3.0-3) Suggests: goftest, locfit, spatstat (>= 3.0) Description: Defines types of spatial data on a linear network and provides functionality for geometrical operations, diff --git a/NEWS b/NEWS index 28ed720..52b26ea 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,11 @@ - CHANGES IN spatstat.linnet VERSION 3.1-4.001 + CHANGES IN spatstat.linnet VERSION 3.1-5 OVERVIEW - o Slightly accelerated + o Slightly accelerated. + + o Internal stability improvements. SIGNIFICANT USER-VISIBLE CHANGES diff --git a/R/lpp.R b/R/lpp.R index 931be7f..4d22791 100644 --- a/R/lpp.R +++ b/R/lpp.R @@ -1,7 +1,7 @@ # # lpp.R # -# $Revision: 1.82 $ $Date: 2022/10/09 11:00:03 $ +# $Revision: 1.83 $ $Date: 2024/03/24 00:53:42 $ # # Class "lpp" of point patterns on linear networks @@ -21,6 +21,8 @@ lpp <- function(X, L, ...) { X <- as.data.frame(X) #' validate local coordinates if(nrow(X) > 0) { + X$seg <- as.integer(X$seg) + X$tp <- as.double(X$tp) nedge <- nsegments(L) if(with(X, any(seg < 1 | seg > nedge))) stop("Segment index coordinate 'seg' exceeds bounds") @@ -47,7 +49,8 @@ lpp <- function(X, L, ...) { #' projected points (spatial coordinates and marks) df <- as.data.frame(pro$Xproj) #' local coordinates - lo <- data.frame(seg=pro$mapXY, tp=pro$tp) + lo <- data.frame(seg = as.integer(pro$mapXY), + tp = as.double(pro$tp)) } } # combine spatial, local, marks diff --git a/inst/doc/packagesizes.txt b/inst/doc/packagesizes.txt index 8b5dbdc..4ddbbfd 100755 --- a/inst/doc/packagesizes.txt +++ b/inst/doc/packagesizes.txt @@ -31,4 +31,5 @@ date version nhelpfiles nobjects ndatasets Rlines srclines "2023-10-22" "3.1-2" 148 307 0 12268 3270 "2023-10-28" "3.1-3" 148 307 0 12268 3270 "2024-02-04" "3.1-4" 148 312 0 12340 3270 -"2024-02-05" "3.1-4.001" 148 312 0 12340 3270 +"2024-03-24" "3.1-5" 148 312 0 12343 3270 +"2024-03-24" "3.1-5" 148 312 0 12343 3270