diff --git a/CITATION.cff b/CITATION.cff index 87739d0..2857c6f 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ message: 'To cite package "rsmatrix" in publications use:' type: software license: MIT title: 'rsmatrix: Matrices for Repeat-Sales Price Indexes' -version: 0.2.9 +version: 0.2.10 doi: 10.5281/zenodo.10110159 identifiers: - type: doi @@ -28,10 +28,10 @@ preferred-citation: given-names: Steve orcid: https://orcid.org/0000-0003-2544-9480 email: marberts@protonmail.com - year: '2024' + year: '2026' doi: 10.5281/zenodo.10110159 url: https://cran.r-project.org/package=rsmatrix - notes: R package version 0.2.9 + notes: R package version 0.2.10 repository: https://CRAN.R-project.org/package=rsmatrix repository-code: https://github.com/marberts/rsmatrix url: https://marberts.github.io/rsmatrix/ @@ -58,7 +58,7 @@ references: institution: name: R Foundation for Statistical Computing address: Vienna, Austria - year: '2025' + year: '2026' version: '>= 4.0' - type: software title: Matrix @@ -77,7 +77,7 @@ references: - family-names: Jagan given-names: Mikael orcid: https://orcid.org/0000-0002-3542-2938 - year: '2025' + year: '2026' doi: 10.32614/CRAN.package.Matrix version: '>= 1.5-0' - type: software @@ -91,7 +91,7 @@ references: given-names: Yihui email: xie@yihui.name orcid: https://orcid.org/0000-0003-0645-5666 - year: '2025' + year: '2026' doi: 10.32614/CRAN.package.knitr - type: software title: rmarkdown @@ -135,7 +135,7 @@ references: given-names: Richard email: rich@posit.co orcid: https://orcid.org/0000-0003-3925-190X - year: '2025' + year: '2026' doi: 10.32614/CRAN.package.rmarkdown - type: software title: testthat @@ -147,7 +147,7 @@ references: - family-names: Wickham given-names: Hadley email: hadley@posit.co - year: '2025' + year: '2026' doi: 10.32614/CRAN.package.testthat version: '>= 3.0.0' - type: software @@ -161,7 +161,7 @@ references: given-names: Steve email: marberts@protonmail.com orcid: https://orcid.org/0000-0003-2544-9480 - year: '2025' + year: '2026' doi: 10.32614/CRAN.package.gpindex - type: software title: piar @@ -174,7 +174,7 @@ references: given-names: Steve email: marberts@protonmail.com orcid: https://orcid.org/0000-0003-2544-9480 - year: '2025' + year: '2026' doi: 10.32614/CRAN.package.piar - version: '>= 0.6.0' + version: '>= 0.8.2' diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION index 0705d15..b94012d 100644 --- a/CRAN-SUBMISSION +++ b/CRAN-SUBMISSION @@ -1,3 +1,3 @@ -Version: 0.2.9 -Date: 2024-12-14 03:13:59 UTC -SHA: b35700cf0e20c050b6cb5718d2e96a3a8b97df82 +Version: 0.2.10 +Date: 2026-05-08 02:45:56 UTC +SHA: a3352faa6f4ccff88b8c96301a4d6e3e546eeed4 diff --git a/DESCRIPTION b/DESCRIPTION index c01058f..55739c4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rsmatrix Title: Matrices for Repeat-Sales Price Indexes -Version: 0.2.9.9001 +Version: 0.2.10 Authors@R: c( person(given = "Steve", family = "Martin", role = c("aut", "cre", "cph"), email = "marberts@protonmail.com", @@ -16,12 +16,12 @@ Suggests: rmarkdown, testthat (>= 3.0.0), gpindex, - piar (>= 0.6.0) + piar (>= 0.8.2) License: MIT + file LICENSE Encoding: UTF-8 URL: https://marberts.github.io/rsmatrix/, https://github.com/marberts/rsmatrix BugReports: https://github.com/marberts/rsmatrix/issues Config/testthat/edition: 3 VignetteBuilder: knitr -RoxygenNote: 7.3.2 Roxygen: list(markdown = TRUE) +Config/roxygen2/version: 8.0.0 diff --git a/NEWS.md b/NEWS.md index 12a2acc..f79e05c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +## rsmatrix 0.2.10 + +- Fixed failing check on CRAN. + ## rsmatrix 0.2.9 - Updated maintainer email. diff --git a/cran-comments.md b/cran-comments.md index 5eedecc..74cfdf7 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,8 +1,7 @@ ## Test environments -- local Ubuntu 24.04 installation, R 4.4.2 +- local Ubuntu 24.04 installation, R 4.5.3 - win-builder (devel, release, oldrelease) -- mac-builder ## R CMD check results diff --git a/inst/CITATION b/inst/CITATION index 5c55290..f0931a4 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -3,7 +3,7 @@ bibentry( title = "{rsmatrix}: Matrices for Repeat-Sales Price Indexes", author = person("Steve", "Martin", role = c("aut", "cre", "cph"), comment = c(ORCID = "0000-0003-2544-9480")), - year = "2024", + year = "2026", doi = "10.5281/zenodo.10110159", url = "https://cran.r-project.org/package=rsmatrix", note = sprintf("R package version %s", meta$Version) diff --git a/man/rsmatrix-package.Rd b/man/rsmatrix-package.Rd index 6904527..1dc7e75 100644 --- a/man/rsmatrix-package.Rd +++ b/man/rsmatrix-package.Rd @@ -22,5 +22,10 @@ Useful links: \author{ \strong{Maintainer}: Steve Martin \email{marberts@protonmail.com} (\href{https://orcid.org/0000-0003-2544-9480}{ORCID}) [copyright holder] +Authors: +\itemize{ + \item Steve Martin \email{marberts@protonmail.com} (\href{https://orcid.org/0000-0003-2544-9480}{ORCID}) [copyright holder] +} + } \keyword{internal} diff --git a/vignettes/rsmatrix.Rmd b/vignettes/rsmatrix.Rmd index 8353bdb..367d306 100644 --- a/vignettes/rsmatrix.Rmd +++ b/vignettes/rsmatrix.Rmd @@ -170,14 +170,14 @@ Once the index is calculated, it's often easier to turn into a matrix-like objec library(piar) dimensions <- do.call(rbind, strsplit(rownames(grs), ".", fixed = TRUE)) -grs_piar <- elemental_index( +grs_piar <- elementary_index( grs, period = dimensions[, 2], ea = dimensions[, 1], chainable = FALSE ) -head(grs_piar, c(5, 5)) +grs_piar[1:5, 1:5] ``` ## Sales pair contributions