Skip to content

Commit 51953d1

Browse files
committed
Ready for CRAN
1 parent 44fdc2a commit 51953d1

5 files changed

Lines changed: 19 additions & 7 deletions

File tree

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: spatstat.sparse
2-
Version: 3.1-0.011
3-
Date: 2026-04-27
2+
Version: 3.2-0
3+
Date: 2026-05-21
44
Title: Sparse Three-Dimensional Arrays and Linear Algebra Utilities
55
Authors@R: c(person("Adrian", "Baddeley",
66
role = c("aut", "cre", "cph"),
@@ -16,7 +16,7 @@ Authors@R: c(person("Adrian", "Baddeley",
1616
comment=c(ORCID="0000-0002-6675-533X")))
1717
Maintainer: Adrian Baddeley <Adrian.Baddeley@curtin.edu.au>
1818
Depends: R (>= 3.5.0), stats, utils, methods, Matrix, abind, tensor
19-
Imports: spatstat.utils (>= 3.0-5)
19+
Imports: spatstat.utils (>= 3.2-3)
2020
Description: Defines sparse three-dimensional arrays
2121
and supports standard operations on them.
2222
The package also includes utility functions for

NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
CHANGES IN spatstat.sparse VERSION 3.1-0.011
2+
CHANGES IN spatstat.sparse VERSION 3.2-0
33

44
OVERVIEW
55

inst/doc/packagesizes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
1919
"2023-03-12" "3.0-1" 15 48 0 2092 740
2020
"2023-10-24" "3.0-3" 15 48 0 2092 740
2121
"2024-06-21" "3.1-0" 15 48 0 2092 740
22-
"2026-04-27" "3.1-0.011" 18 54 0 2344 943
22+
"2026-05-21" "3.2-0" 18 54 0 2344 943

inst/info/packagesizes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
1919
"2023-03-12" "3.0-1" 15 48 0 2092 740
2020
"2023-10-24" "3.0-3" 15 48 0 2092 740
2121
"2024-06-21" "3.1-0" 15 48 0 2092 740
22-
"2026-04-27" "3.1-0.011" 18 54 0 2344 943
22+
"2026-05-21" "3.2-0" 18 54 0 2344 943

tests/sparse3Darrays.R

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require(spatstat.sparse)
55
ALWAYS <- FULLTEST <- TRUE
66
#' tests/sparse3Darrays.R
77
#' Basic tests of code in sparse3Darray.R and sparsecommon.R
8-
#' $Revision: 1.33 $ $Date: 2026/04/27 06:49:58 $
8+
#' $Revision: 1.34 $ $Date: 2026/05/06 03:38:51 $
99

1010
if(!exists("ALWAYS")) ALWAYS <- TRUE
1111
if(!exists("FULLTEST")) FULLTEST <- ALWAYS
@@ -376,6 +376,18 @@ local({
376376
A <- array(runif(75) * (runif(75) < 0.7), dim=c(3,5,5))
377377
M <- as.sparse3Darray(A)
378378
M[rep(1,3), c(1,1,2), rep(2, 3)]
379+
380+
## and again using a fixed mwe
381+
Afull <- array(1:50, dim=c(2,5,5))
382+
Asparse <- as.sparse3Darray(Afull)
383+
Mfull <- abs(.col(c(5,5)) - .row(c(5,5)))
384+
Msparse <- as(as(Mfull, "symmetricMatrix"), "sparseMatrix")
385+
Rfull <- sumsymouter(Afull, Mfull)
386+
Rsparse <- sumsymouterSparse(Asparse, Msparse)
387+
if(!all(Rsparse==Rfull))
388+
stop(paste("sumsymouter(x, w): sparse and non-sparse algorithms disagree",
389+
"when w is symmetric"))
390+
379391
})
380392

381393
}

0 commit comments

Comments
 (0)