diff --git a/.buildlibrary b/.buildlibrary index 0224b7b..4d83073 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '627240389' +ValidationKey: '627605496' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index 974a2b6..e2520ae 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'quitte: Bits and pieces of code to use with quitte-style data frames' -version: 0.3137.3 -date-released: '2024-09-27' +version: 0.3137.4 +date-released: '2024-10-08' abstract: A collection of functions for easily dealing with quitte-style data frames, doing multi-model comparisons and plots. authors: diff --git a/DESCRIPTION b/DESCRIPTION index a562d17..a16d192 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: quitte Title: Bits and pieces of code to use with quitte-style data frames -Version: 0.3137.3 -Date: 2024-09-27 +Version: 0.3137.4 +Date: 2024-10-08 Authors@R: c( person("Michaja", "Pehl", , "pehl@pik-potsdam.de", role = c("aut", "cre")), person("Nico", "Bauer", , "nicolasb@pik-potsdam.de", role = "aut"), diff --git a/R/read.snapshot.R b/R/read.snapshot.R index e3597bd..3aa0bf5 100644 --- a/R/read.snapshot.R +++ b/R/read.snapshot.R @@ -3,7 +3,7 @@ #' If head, tail and grep are on your system, a pre-filtering improves performance for csv files. #' #' @md -#' @param file Path of single IAMC-style .csv/.mif file +#' @param file Path of single IAMC-style .csv/.mif/.xlsx/.rds file #' @param keep list with quitte columns as names and data points that should be kept. #' If head, tail and grep are available and a csv/mif file is read, this list is used to extract the #' data before reading it into R. The more you restrict the data here, the faster the data is read. @@ -81,6 +81,7 @@ read.snapshot <- function(file, keep = list(), filter.function = identity) { na.strings = c("UNDF", "NA", "N/A", "n_a", ""), quote = '"', drop.na = TRUE, + check.duplicates = FALSE, filter.function = joinedfilter) unlink(tmpfile) return(data) diff --git a/README.md b/README.md index 4307713..bf53b86 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Bits and pieces of code to use with quitte-style data frames -R package **quitte**, version **0.3137.3** +R package **quitte**, version **0.3137.4** [![CRAN status](https://www.r-pkg.org/badges/version/quitte)](https://cran.r-project.org/package=quitte) [![R build status](https://github.com/pik-piam/quitte/workflows/check/badge.svg)](https://github.com/pik-piam/quitte/actions) [![codecov](https://codecov.io/gh/pik-piam/quitte/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/quitte) [![r-universe](https://pik-piam.r-universe.dev/badges/quitte)](https://pik-piam.r-universe.dev/builds) @@ -47,7 +47,7 @@ In case of questions / problems please contact Michaja Pehl . +Pehl M, Bauer N, Hilaire J, Levesque A, Luderer G, Schultes A, Dietrich J, Richters O (2024). _quitte: Bits and pieces of code to use with quitte-style data frames_. R package version 0.3137.4, . A BibTeX entry for LaTeX users is @@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is title = {quitte: Bits and pieces of code to use with quitte-style data frames}, author = {Michaja Pehl and Nico Bauer and Jérôme Hilaire and Antoine Levesque and Gunnar Luderer and Anselm Schultes and Jan Philipp Dietrich and Oliver Richters}, year = {2024}, - note = {R package version 0.3137.3}, + note = {R package version 0.3137.4}, url = {https://github.com/pik-piam/quitte}, } ``` diff --git a/man/read.snapshot.Rd b/man/read.snapshot.Rd index e5b56ca..630d7d4 100644 --- a/man/read.snapshot.Rd +++ b/man/read.snapshot.Rd @@ -9,7 +9,7 @@ If head, tail and grep are on your system, a pre-filtering improves performance read.snapshot(file, keep = list(), filter.function = identity) } \arguments{ -\item{file}{Path of single IAMC-style .csv/.mif file} +\item{file}{Path of single IAMC-style .csv/.mif/.xlsx/.rds file} \item{keep}{list with quitte columns as names and data points that should be kept. If head, tail and grep are available and a csv/mif file is read, this list is used to extract the