Bug fix

Author: baddstats

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: spatstat.sparse
-Version: 3.0-1
-Date: 2023-03-12
+Version: 3.0-1.001
+Date: 2023-06-23
 Title: Sparse Three-Dimensional Arrays and Linear Algebra Utilities
 Authors@R: c(person("Adrian", "Baddeley", 
                     role = c("aut", "cre", "cph"),

NEWS

@@ -1,4 +1,21 @@
 
+        CHANGES IN spatstat.sparse VERSION 3.0-1.001
+
+OVERVIEW
+
+    o We thank Joey Arthur for contributions.
+    
+    o Bug fix.
+
+BUG FIXES
+
+    o marginSumsSparse
+    If the result of marginSumsSparse was a one-dimensional sparse vector,
+    the entries were incorrectly rearranged so that the non-zero entries
+    were all at the beginning of the vector.
+    [Spotted by Joey Arthur.]
+    Fixed.
+
         CHANGES IN spatstat.sparse VERSION 3.0-1
 
 OVERVIEW

R/sparse3Darray.R

@@ -6,7 +6,7 @@
 #' Copyright (c) Adrian Baddeley, Ege Rubak and Rolf Turner 2016-2020
 #' GNU Public Licence >= 2.0
 #'
-#' $Revision: 1.44 $  $Date: 2021/03/04 07:42:18 $
+#' $Revision: 1.45 $  $Date: 2023/06/23 02:26:26 $
 #'
 
 sparse3Darray <- function(i=integer(0), j=integer(0), k=integer(0),
@@ -911,7 +911,7 @@ EntriesToSparse <- function(df, dims) {
       first <- !dup
       newi <- cumsum(first)
       newx <- as(tapply(df$x, newi, sum), typeof(df$x))
-      df <- data.frame(i=newi[first], x=newx)
+      df <- data.frame(i=df$i[first], x=newx)
     }
     result <- with(df, sparseVector(i=i, x=x, length=dims))
   } else if(nd == 2) {

inst/doc/packagesizes.txt

@@ -17,3 +17,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2021-03-16" "2.0-0" 14 48 0 2059 733
 "2022-10-19" "3.0-0" 15 48 0 2092 740
 "2023-03-12" "3.0-1" 15 48 0 2092 740
+"2023-06-23" "3.0-1.001" 15 48 0 2092 740

man/macros/defns.Rd

@@ -32,6 +32,7 @@
 \newcommand{\Martin}{\ifelse{latex}{\out{Mart\'{\i}n}}{Martin}}
 \newcommand{\Dominguez}{\ifelse{latex}{\out{Dom\'{\i}nguez}}{Dominguez}}
 \newcommand{\Rodriguez}{\ifelse{latex}{\out{Rodr\'{\i}guez}}{Rodriguez}}
+\newcommand{\Gonzalez}{\ifelse{latex}{\out{Gonz\'{a}lez}}{Gonzalez}}
 %% List of all Gibbs interactions 
 \newcommand{\GibbsInteractionsList}{\code{\link[MPKG]{AreaInter}}, \code{\link[MPKG]{BadGey}}, \code{\link[MPKG]{Concom}}, \code{\link[MPKG]{DiggleGatesStibbard}}, \code{\link[MPKG]{DiggleGratton}}, \code{\link[MPKG]{Fiksel}}, \code{\link[MPKG]{Geyer}}, \code{\link[MPKG]{Hardcore}}, \code{\link[MPKG]{HierHard}}, \code{\link[MPKG]{HierStrauss}}, \code{\link[MPKG]{HierStraussHard}}, \code{\link[MPKG]{Hybrid}}, \code{\link[MPKG]{LennardJones}}, \code{\link[MPKG]{MultiHard}}, \code{\link[MPKG]{MultiStrauss}}, \code{\link[MPKG]{MultiStraussHard}}, \code{\link[MPKG]{OrdThresh}}, \code{\link[MPKG]{Ord}}, \code{\link[MPKG]{Pairwise}}, \code{\link[MPKG]{PairPiece}}, \code{\link[MPKG]{Penttinen}}, \code{\link[MPKG]{Poisson}}, \code{\link[MPKG]{Saturated}}, \code{\link[MPKG]{SatPiece}}, \code{\link[MPKG]{Softcore}}, \code{\link[MPKG]{Strauss}}, \code{\link[MPKG]{StraussHard}} and \code{\link[MPKG]{Triplets}}}
 %% List of interactions recognised by RMH code

tests/sparse3Darrays.R

@@ -5,7 +5,7 @@ require(spatstat.sparse)
 ALWAYS <- FULLTEST <- TRUE
 #'    tests/sparse3Darrays.R
 #'  Basic tests of code in sparse3Darray.R and sparsecommon.R
-#'  $Revision: 1.28 $ $Date: 2021/03/07 07:39:44 $
+#'  $Revision: 1.32 $ $Date: 2023/06/23 02:34:57 $
 
 if(!exists("ALWAYS")) ALWAYS <- TRUE
 if(!exists("FULLTEST")) FULLTEST <- ALWAYS
@@ -46,14 +46,19 @@ local({
   A11 <- A[,1,1]
   AA11 <- as.sparse3Darray(A11)
   #' NULL with warning
-  as.sparse3Darray(list())
+  suppressWarnings(Niets <- as.sparse3Darray(list()))
 
   #' 
   dim(AA) <- dim(AA) + 1
 
   I1 <- SparseIndices(A1)
   I11 <- SparseIndices(A11)
 
+  BB <- evalSparse3Dentrywise(AA + AA/2)
+
+  MM <- bind.sparse3Darray(M, M, along=1)
+  MM <- bind.sparse3Darray(M, M, along=2)
+
   if(require(Matrix)) {
     #' sparse matrices from Matrix package
     A1 <- as(A1, "sparseMatrix")
@@ -75,19 +80,33 @@ local({
     bb <- EntriesToSparse(df, 7)
     cc <- EntriesToSparse(df, c(7, 4))
     dd <- EntriesToSparse(df, c(7, 4, 3))
+
     #' duplicated entries
     dfdup <- df[c(1:3, 2), ]
     aa <- EntriesToSparse(dfdup, NULL)
     bb <- EntriesToSparse(dfdup, 7)
     cc <- EntriesToSparse(dfdup, c(7, 4))
     dd <- EntriesToSparse(dfdup, c(7, 4, 3))
-  }
-
-  BB <- evalSparse3Dentrywise(AA + AA/2)
-
-  MM <- bind.sparse3Darray(M, M, along=1)
-  MM <- bind.sparse3Darray(M, M, along=2)
+    
+    #' example from Joey Arthur (bug in EntriesToSparse)
+    joey <- as.sparse3Darray(
+      list(
+        as(matrix(rep(1, 9), 3, 3), 'dgCMatrix'),
+        as(matrix(rep(0, 9), 3, 3), 'dgCMatrix'),
+        as(matrix(rep(2, 9), 3, 3), 'dgCMatrix')
+      )
+    )
+    answer <- marginSumsSparse(joey, 3)
+    rightanswer <- marginSums(as.array(joey), 3) # [1] 9 0 18
+    if(!all(as.vector(answer) == rightanswer))  {
+      cat("Result of marginSumsSparse:\n")
+      print(answer)
+      cat("Right answer:\n")
+      print(rightanswer)
+      stop("Incorrect answer from marginSumsSparse")
+    }
 
+  }
 })
 
 
@@ -333,3 +352,4 @@ local({
 })
 
 }
+