Skip to content

Commit 3b40f08

Browse files
committed
Speed improvements; fix .Rbuildignore
1 parent 5619692 commit 3b40f08

5 files changed

Lines changed: 17 additions & 8 deletions

File tree

.Rbuildignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
README.md
22
ChangeLog.txt
3-
.git
4-
.gitignore
3+
\.git$
4+
\.github$
5+
\.gitignore$
56
^.*\.Rproj$
67
^\.Rproj\.user$
78
^\.travis\.yml$

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: spatstat.sparse
2-
Version: 3.0-3
3-
Date: 2023-10-24
2+
Version: 3.0-3.001
3+
Date: 2024-06-15
44
Title: Sparse Three-Dimensional Arrays and Linear Algebra Utilities
55
Authors@R: c(person("Adrian", "Baddeley",
66
role = c("aut", "cre", "cph"),

NEWS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11

2+
CHANGES IN spatstat.sparse VERSION 3.0-3.001
3+
4+
OVERVIEW
5+
6+
o Minor improvements.
7+
8+
29
CHANGES IN spatstat.sparse VERSION 3.0-3
310

411
OVERVIEW

R/matrixpower.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#' Copyright (c) Adrian Baddeley, Ege Rubak and Rolf Turner 2016-2022
55
#' GNU Public Licence >= 2.0
66
#'
7-
#' $Revision: 1.8 $ $Date: 2022/04/18 03:17:30 $
7+
#' $Revision: 1.9 $ $Date: 2024/06/09 00:01:09 $
88
#'
99

1010
matrixsqrt <- function(x, complexOK=TRUE) {
@@ -13,7 +13,7 @@ matrixsqrt <- function(x, complexOK=TRUE) {
1313
stop("x must be a matrix")
1414
if(!is.matrix(x))
1515
x <- as.matrix(x)
16-
check.nmatrix(x) ## requires square matrix
16+
check.nmatrix(x, mname="x") ## requires square matrix
1717
if(missing(complexOK) && is.complex(x)) complexOK <- TRUE
1818
if(!complexOK) stopifnot(is.numeric(x)) else
1919
stopifnot(is.numeric(x) || is.complex(x))
@@ -45,7 +45,7 @@ matrixinvsqrt <- function(x, complexOK=TRUE) {
4545
stop("x must be a matrix")
4646
if(!is.matrix(x))
4747
x <- as.matrix(x)
48-
check.nmatrix(x) ## requires square matrix
48+
check.nmatrix(x, mname="x") ## requires square matrix
4949
if(missing(complexOK) && is.complex(x)) complexOK <- TRUE
5050
if(!complexOK) stopifnot(is.numeric(x)) else
5151
stopifnot(is.numeric(x) || is.complex(x))
@@ -79,7 +79,7 @@ matrixpower <- function(x, power, complexOK=TRUE) {
7979
stop("x must be a matrix")
8080
if(!is.matrix(x))
8181
x <- as.matrix(x)
82-
check.nmatrix(x) ## requires square matrix
82+
check.nmatrix(x, mname="x") ## requires square matrix
8383
if(power == 0) {
8484
## power = 0 yields identity matrix even if x is singular
8585
y <- diag(nrow(x))

inst/doc/packagesizes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
1818
"2022-10-19" "3.0-0" 15 48 0 2092 740
1919
"2023-03-12" "3.0-1" 15 48 0 2092 740
2020
"2023-10-24" "3.0-3" 15 48 0 2092 740
21+
"2024-06-15" "3.0-3.001" 15 48 0 2092 740

0 commit comments

Comments
 (0)