diff --git a/CITATION.cff b/CITATION.cff index 3e79c0e..3870302 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ message: 'To cite package "arkhe" in publications use:' type: software license: GPL-3.0-or-later title: 'arkhe: Tools for Cleaning Rectangular Data' -version: 1.2.0 +version: 1.3.0 doi: 10.5281/zenodo.3526659 abstract: A dependency-free collection of simple functions for cleaning rectangular data. This package allows to detect, count and replace values or discard rows/columns @@ -32,7 +32,7 @@ preferred-citation: year: '2023' location: name: Pessac, France - notes: R package version 1.2.0 + notes: R package version 1.3.0 url: https://packages.tesselle.org/arkhe/ doi: 10.5281/zenodo.3526659 institution: @@ -62,7 +62,7 @@ references: year: '2023' institution: name: R Foundation for Statistical Computing - version: '>= 3.3' + version: '>= 3.5' - type: software title: methods abstract: 'R: A Language and Environment for Statistical Computing' @@ -97,17 +97,17 @@ references: institution: name: R Foundation for Statistical Computing - type: software - title: testthat - abstract: 'testthat: Unit Testing for R' + title: tinytest + abstract: 'tinytest: Lightweight and Feature Complete Unit Testing Framework' notes: Suggests - url: https://testthat.r-lib.org - repository: https://CRAN.R-project.org/package=testthat + url: https://github.com/markvanderloo/tinytest + repository: https://CRAN.R-project.org/package=tinytest authors: - - family-names: Wickham - given-names: Hadley - email: hadley@rstudio.com + - family-names: van der Loo + given-names: Mark + email: mark.vanderloo@gmail.com + orcid: https://orcid.org/0000-0002-9807-4686 year: '2023' - version: '>= 3.0.0' identifiers: - description: The concept DOI. type: doi diff --git a/DESCRIPTION b/DESCRIPTION index c0f8e51..5289306 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: arkhe Title: Tools for Cleaning Rectangular Data -Version: 1.2.0.9000 +Version: 1.3.0 Authors@R: c( person("Nicolas", "Frerebeau", , "nicolas.frerebeau@u-bordeaux-montaigne.fr", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-5759-4944", affiliation = "Université Bordeaux Montaigne")), diff --git a/NEWS.md b/NEWS.md index e58b563..fe2ae72 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# arkhe 1.2.0.9000 +# arkhe 1.3.0 ## New classes and methods * Add `remove_constant()` to remove constant columns. * Add `remove_empty()` to remove empty strings in a `matrix`-like object. diff --git a/R/arkhe-package.R b/R/arkhe-package.R index 2c6fa67..62aa492 100644 --- a/R/arkhe-package.R +++ b/R/arkhe-package.R @@ -2,7 +2,7 @@ #' \tabular{ll}{ #' **Package:** \tab arkhe \cr #' **Type:** \tab Package \cr -#' **Version:** \tab 1.2.0 \cr +#' **Version:** \tab 1.3.0 \cr #' **License:** \tab GPL-3 \cr #' **Zenodo:** \tab \doi{10.5281/zenodo.3526659} \cr #' } diff --git a/README.md b/README.md index 1a18325..05f5da0 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ messages. Frerebeau N (2023). _arkhe: Tools for Cleaning Rectangular Data_. Université Bordeaux Montaigne, Pessac, France. doi:10.5281/zenodo.3526659 , - R package version 1.2.0, . + R package version 1.3.0, . Une entrée BibTeX pour les utilisateurs LaTeX est @@ -55,7 +55,7 @@ messages. year = {2023}, organization = {Université Bordeaux Montaigne}, address = {Pessac, France}, - note = {R package version 1.2.0}, + note = {R package version 1.3.0}, url = {https://packages.tesselle.org/arkhe/}, doi = {10.5281/zenodo.3526659}, } @@ -93,49 +93,50 @@ k <- sample(1:25, 3, FALSE) X[k] <- NA X #> [,1] [,2] [,3] [,4] [,5] -#> [1,] 10 6 5 9 5 -#> [2,] 8 10 8 5 5 -#> [3,] 4 NA 6 NA 9 -#> [4,] 5 10 NA 6 1 -#> [5,] 8 7 4 3 5 +#> [1,] 5 8 NA 3 5 +#> [2,] 9 7 8 4 2 +#> [3,] 4 10 7 NA 2 +#> [4,] NA 5 5 4 3 +#> [5,] 7 9 9 8 1 ## Count missing values in rows count(X, f = is.na, margin = 1) -#> [1] 0 0 2 1 0 +#> [1] 1 0 1 1 0 ## Count non-missing values in columns count(X, f = is.na, margin = 2, negate = TRUE) -#> [1] 5 4 4 4 5 +#> V1 V2 V3 V4 V5 +#> 4 5 4 4 5 ## Find row with NA detect(X, f = is.na, margin = 1) -#> [1] FALSE FALSE TRUE TRUE FALSE +#> [1] TRUE FALSE TRUE TRUE FALSE ## Find column without any NA detect(X, f = is.na, margin = 2, negate = TRUE, all = TRUE) -#> [1] TRUE FALSE FALSE FALSE TRUE +#> V1 V2 V3 V4 V5 +#> FALSE TRUE FALSE FALSE TRUE ## Remove row with any NA discard(X, f = is.na, margin = 1, all = FALSE) #> [,1] [,2] [,3] [,4] [,5] -#> [1,] 10 6 5 9 5 -#> [2,] 8 10 8 5 5 -#> [3,] 8 7 4 3 5 +#> [1,] 9 7 8 4 2 +#> [2,] 7 9 9 8 1 ## Remove column with any NA discard(X, f = is.na, margin = 2, all = FALSE) #> [,1] [,2] -#> [1,] 10 5 -#> [2,] 8 5 -#> [3,] 4 9 -#> [4,] 5 1 -#> [5,] 8 5 +#> [1,] 8 5 +#> [2,] 7 2 +#> [3,] 10 2 +#> [4,] 5 3 +#> [5,] 9 1 ## Replace NA with zeros replace_NA(X, value = 0) #> [,1] [,2] [,3] [,4] [,5] -#> [1,] 10 6 5 9 5 -#> [2,] 8 10 8 5 5 -#> [3,] 4 0 6 0 9 -#> [4,] 5 10 0 6 1 -#> [5,] 8 7 4 3 5 +#> [1,] 5 8 0 3 5 +#> [2,] 9 7 8 4 2 +#> [3,] 4 10 7 0 2 +#> [4,] 0 5 5 4 3 +#> [5,] 7 9 9 8 1 ``` ## Contributing diff --git a/_pkgdown.yml b/_pkgdown.yml index 96ea184..21353cd 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -13,6 +13,12 @@ reference: - title: Data transformation contents: - has_concept("transformation tools") +- title: Predicates + contents: + - has_concept("predicates") +- title: Validation + contents: + - has_concept("validation methods") - title: Statistics contents: - has_concept("summary statistics") @@ -22,9 +28,3 @@ reference: - title: Mathematics contents: - has_concept("mathematic functions") -- title: Predicates - contents: - - has_concept("predicates") -- title: Validation - contents: - - has_concept("validation methods") diff --git a/codemeta.json b/codemeta.json index af7a775..bbff78c 100644 --- a/codemeta.json +++ b/codemeta.json @@ -8,7 +8,7 @@ "codeRepository": "https://github.com/tesselle/arkhe", "issueTracker": "https://github.com/tesselle/arkhe/issues", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "1.2.0.9000", + "version": "1.3.0", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -86,7 +86,7 @@ }, "SystemRequirements": null }, - "fileSize": "245.76KB", + "fileSize": "256.739KB", "citation": [ { "@type": "SoftwareSourceCode", @@ -101,7 +101,7 @@ "name": "{arkhe: Tools for Cleaning Rectangular Data}", "identifier": "10.5281/zenodo.3526659", "url": "https://packages.tesselle.org/arkhe/", - "description": "R package version 1.2.0", + "description": "R package version 1.3.0", "@id": "https://doi.org/10.5281/zenodo.3526659", "sameAs": "https://doi.org/10.5281/zenodo.3526659" } diff --git a/cran-comments.md b/cran-comments.md index d798696..8e62b08 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,5 +1,5 @@ ## Test environments -* Local R installation: R 4.3.0 +* Local R installation: R 4.3.1 * Ubuntu (on GitHub Actions): R devel, release, oldrel * Windows (on GitHub Actions and win-builder): R devel, release, oldrel * MacOS (on GitHub Actions): R release @@ -10,7 +10,7 @@ ## revdepcheck results -We checked 3 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. +We checked 4 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. - * We saw 0 new problems - * We failed to check 0 packages +* We saw 0 new problems +* We failed to check 0 packages diff --git a/inst/CITATION b/inst/CITATION index 13bec98..7080bf7 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -7,7 +7,7 @@ bibentry( year = "2023", organization = "Université Bordeaux Montaigne", address = "Pessac, France", - note = "R package version 1.2.0", + note = sprintf("R package version %s", meta$Version), url = "https://packages.tesselle.org/arkhe/", doi = "10.5281/zenodo.3526659" ) diff --git a/man/arkhe-package.Rd b/man/arkhe-package.Rd index ec22d5e..6322d7f 100644 --- a/man/arkhe-package.Rd +++ b/man/arkhe-package.Rd @@ -15,7 +15,7 @@ A dependency-free collection of simple functions for cleaning rectangular data. \tabular{ll}{ \strong{Package:} \tab arkhe \cr \strong{Type:} \tab Package \cr -\strong{Version:} \tab 1.2.0 \cr +\strong{Version:} \tab 1.3.0 \cr \strong{License:} \tab GPL-3 \cr \strong{Zenodo:} \tab \doi{10.5281/zenodo.3526659} \cr } diff --git a/revdep/README.md b/revdep/README.md index 49e0b84..904e39f 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -1,24 +1,24 @@ # Platform -|field |value | -|:--------|:-----------------------------------------------------------------------------| -|version |R version 4.3.0 (2023-04-21) | -|os |Ubuntu 20.04.6 LTS | -|system |x86_64, linux-gnu | -|ui |RStudio | -|language |(EN) | -|collate |fr_FR.UTF-8 | -|ctype |fr_FR.UTF-8 | -|tz |Europe/Paris | -|date |2023-05-10 | -|rstudio |2023.03.0+386 Cherry Blossom (desktop) | -|pandoc |2.19.2 @ /usr/lib/rstudio/resources/app/bin/quarto/bin/tools/ (via rmarkdown) | +|field |value | +|:--------|:----------------------------------------------------------------------------| +|version |R version 4.3.1 (2023-06-16) | +|os |Ubuntu 22.04.3 LTS | +|system |x86_64, linux-gnu | +|ui |RStudio | +|language |(EN) | +|collate |fr_FR.UTF-8 | +|ctype |fr_FR.UTF-8 | +|tz |Europe/Paris | +|date |2023-08-31 | +|rstudio |2023.06.1+524 Mountain Hydrangea (desktop) | +|pandoc |3.1.1 @ /usr/lib/rstudio/resources/app/bin/quarto/bin/tools/ (via rmarkdown) | # Dependencies |package |old |new |Δ | |:-------|:-----|:-----|:--| -|arkhe |1.1.0 |1.2.0 |* | +|arkhe |1.2.0 |1.3.0 |* | # Revdeps diff --git a/revdep/cran.md b/revdep/cran.md index 29c1961..ab1853c 100644 --- a/revdep/cran.md +++ b/revdep/cran.md @@ -1,6 +1,6 @@ ## revdepcheck results -We checked 3 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. +We checked 4 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. * We saw 0 new problems * We failed to check 0 packages