diff -Nru r-cran-spatstat.utils-1.12-0/debian/changelog r-cran-spatstat.utils-1.13-0/debian/changelog --- r-cran-spatstat.utils-1.12-0/debian/changelog 2018-10-30 09:52:16.000000000 +0000 +++ r-cran-spatstat.utils-1.13-0/debian/changelog 2018-11-22 06:58:47.000000000 +0000 @@ -1,3 +1,10 @@ +r-cran-spatstat.utils (1.13-0-1) unstable; urgency=medium + + * Team upload. + * New upstream version + + -- Dylan Aïssi Thu, 22 Nov 2018 07:58:47 +0100 + r-cran-spatstat.utils (1.12-0-1) unstable; urgency=medium * New upstream version diff -Nru r-cran-spatstat.utils-1.12-0/DESCRIPTION r-cran-spatstat.utils-1.13-0/DESCRIPTION --- r-cran-spatstat.utils-1.12-0/DESCRIPTION 2018-10-29 05:40:04.000000000 +0000 +++ r-cran-spatstat.utils-1.13-0/DESCRIPTION 2018-10-31 10:50:17.000000000 +0000 @@ -1,6 +1,6 @@ Package: spatstat.utils -Version: 1.12-0 -Date: 2018-10-19 +Version: 1.13-0 +Date: 2018-10-31 Title: Utility Functions for 'spatstat' Authors@R: c(person("Adrian", "Baddeley", role = c("aut", "cre"), @@ -22,9 +22,9 @@ NeedsCompilation: yes ByteCompile: true BugReports: https://github.com/spatstat/spatstat.utils/issues -Packaged: 2018-10-19 04:22:24 UTC; adrian +Packaged: 2018-10-31 03:29:54 UTC; adrian Author: Adrian Baddeley [aut, cre], Rolf Turner [aut], Ege Rubak [aut] Repository: CRAN -Date/Publication: 2018-10-29 05:40:04 UTC +Date/Publication: 2018-10-31 10:50:17 UTC diff -Nru r-cran-spatstat.utils-1.12-0/inst/doc/packagesizes.txt r-cran-spatstat.utils-1.13-0/inst/doc/packagesizes.txt --- r-cran-spatstat.utils-1.12-0/inst/doc/packagesizes.txt 2018-10-19 04:22:24.000000000 +0000 +++ r-cran-spatstat.utils-1.13-0/inst/doc/packagesizes.txt 2018-10-31 03:29:53.000000000 +0000 @@ -11,3 +11,4 @@ "2018-10-01" "1.10-0" 28 165 0 3260 1944 "2018-10-15" "1.11-0" 29 168 0 3296 1944 "2018-10-19" "1.12-0" 30 169 0 3303 1944 +"2018-10-31" "1.13-0" 30 169 0 3304 1944 diff -Nru r-cran-spatstat.utils-1.12-0/MD5 r-cran-spatstat.utils-1.13-0/MD5 --- r-cran-spatstat.utils-1.12-0/MD5 2018-10-29 05:40:04.000000000 +0000 +++ r-cran-spatstat.utils-1.13-0/MD5 2018-10-31 10:50:17.000000000 +0000 @@ -1,4 +1,4 @@ -243a754e76eb2c08af1d620679c02c4e *DESCRIPTION +d54d37211a32fccbd1b9b9937926ad93 *DESCRIPTION abdb8cbab845e471552197b7556ccf28 *NAMESPACE 11c4cb61a04d1f37594089f7f84fb68d *NEWS 81a0013c01515a69d9c2345e2aa799c9 *R/formulae.R @@ -10,12 +10,12 @@ fa9f66757b4edab07677672cd52e92b9 *R/utilindex.R e167b5360b4d4b0e569ad16bb0ee5955 *R/utilmatrix.R 61dfab95b18e2c29dbe25ab48cf6f4e6 *R/utiloptim.R -ce90914567a3b48bdbc9760dc5cd1ccb *R/utilseq.R +15ac6089ba7e2e1ed6e23c4651017c2a *R/utilseq.R 9f7e5babb8a0a866373615f136087d72 *R/utiltext.R 3715ef2a8ce85d8caf1c886616e8882a *R/xycircle.R f3297f80813c7b1694bafead35972012 *R/xypolygon.R c178f8dd4f7476186c33de119f4ffb87 *R/xysegment.R -e16736488f6c6771faddd75826535a1c *inst/doc/packagesizes.txt +a86b8846b7d195385d527ad0b4808d40 *inst/doc/packagesizes.txt 0c11e69f495fa53d182d3094d84ec3e2 *man/articlebeforenumber.Rd 1c2612c451d7c808eb03c574f17cb36a *man/cat.factor.Rd 743ff83b879b31b961d86fda75891cf7 *man/check.1.integer.Rd @@ -60,5 +60,5 @@ c7cb679d7a7d2e5fe33b2a66a129ee09 *src/primefax.c b0a3ca25739a7cb371aaff22e0723de1 *src/proto.h 3597e6c576823a63c3bd94e4c0b3eef9 *src/revcum.c -db6f3207b76ab7408ab6b5aef02353ee *tests/numerical.R +bebd4027c5b80ac1fe8443842cdb443e *tests/numerical.R 91e31de1f0a6229db0239e6c6f373582 *tests/segments.R diff -Nru r-cran-spatstat.utils-1.12-0/R/utilseq.R r-cran-spatstat.utils-1.13-0/R/utilseq.R --- r-cran-spatstat.utils-1.12-0/R/utilseq.R 2018-09-28 06:00:16.000000000 +0000 +++ r-cran-spatstat.utils-1.13-0/R/utilseq.R 2018-10-31 03:26:55.000000000 +0000 @@ -3,8 +3,9 @@ #' #' Utilities for sequences, vectors, ranges of values #' -#' $Revision: 1.9 $ $Date: 2018/09/28 05:54:57 $ +#' $Revision: 1.14 $ $Date: 2018/10/31 03:26:52 $ #' +#' ==>> ORIGINAL FILE is in spatstat/develop/Spatstat/R <<== dropifsingle <- function(x) if(length(x) == 1) x[[1L]] else x @@ -16,7 +17,7 @@ # order statistic (for use in lapply calls) orderstats <- function(x, k, decreasing=FALSE) { if(decreasing) k <- length(x) + 1L - k - sort(x, na.last=!decreasing, partial=k)[k] + if(anyNA(x)) sort(x, na.last=!decreasing)[k] else sort(x, partial=k)[k] } # ranks (for use in lapply calls) diff -Nru r-cran-spatstat.utils-1.12-0/tests/numerical.R r-cran-spatstat.utils-1.13-0/tests/numerical.R --- r-cran-spatstat.utils-1.12-0/tests/numerical.R 2018-09-30 10:07:37.000000000 +0000 +++ r-cran-spatstat.utils-1.13-0/tests/numerical.R 2018-10-31 03:29:23.000000000 +0000 @@ -15,6 +15,18 @@ stop("Incorrect result from orderwhich(decreasing=TRUE)") y <- fave.order(x) +#' must handle NA's without exiting +x[c(4, 7, 42)] <- NA +aa <- orderstats(x, 2:5) +aa <- orderstats(x, 2:5, decreasing=TRUE) +bb <- orderwhich(x, 2:5) +bb <- orderwhich(x, 2:5, decreasing=TRUE) +x[] <- NA +uu <- orderstats(x, 2:5) +uu <- orderstats(x, 2:5, decreasing=TRUE) +vv <- orderwhich(x, 2:5) +vv <- orderwhich(x, 2:5, decreasing=TRUE) + #' validity of 'tapplysum' aa <- factor(letters[1:3]) bb <- factor(letters[1:4])[c(1,2,2)]