diff --git a/.buildlibrary b/.buildlibrary index 7786d975..68e42bce 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '224675531' +ValidationKey: '224695314' 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 2f14157e..53e5d86b 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'remind2: The REMIND R package (2nd generation)' -version: 1.135.7 +version: 1.135.8 date-released: '2024-03-01' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 8e17fc25..66850993 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.135.7 +Version: 1.135.8 Date: 2024-03-01 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), @@ -62,7 +62,7 @@ Imports: madrat, mip (>= 0.139.1), openxlsx, - piamInterfaces (>= 0.12.17), + piamInterfaces (>= 0.13.12), plotly, quitte, readr, diff --git a/NAMESPACE b/NAMESPACE index c775aeb8..fc67eee1 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -6,7 +6,6 @@ export(calcPrice) export(calcTimeSeriesStats) export(calc_CES_marginals) export(calc_regionSubset_sums) -export(checkVariableNames) export(checkVsCalibData) export(colorScenConf) export(compareCalibrationTargets) @@ -220,6 +219,7 @@ importFrom(openxlsx,createWorkbook) importFrom(openxlsx,saveWorkbook) importFrom(openxlsx,writeData) importFrom(piamInterfaces,checkSummations) +importFrom(piamInterfaces,checkVarNames) importFrom(plotly,config) importFrom(plotly,ggplotly) importFrom(plotly,hide_legend) diff --git a/R/checkVariableNames.R b/R/checkVariableNames.R index 737da1fa..94468fdf 100644 --- a/R/checkVariableNames.R +++ b/R/checkVariableNames.R @@ -3,23 +3,11 @@ #' Pass a vector of variable names including the units. Get warnings if inconsistencies are found #' for the reporting #' @param vars vector with variable names and units such as "PE (EJ)" +#' @importFrom piamInterfaces checkVarNames #' @author Oliver Richters -#' @export -checkVariableNames <- function(vars) { - - barspace <- grep("[\\| ]{2}|^[\\| ]|[\\| ]$", vars, value = TRUE) - if (length(barspace) > 0) { - warning("These variable names have wrong bars and spaces: ", paste(barspace, collapse = ", ")) - } - NAvar <- grep("[\\|\\( ]NA[\\|\\) ]|^NA", vars, value = TRUE) - NAvar <- NAvar[! grepl("^Services and Products\\|Transport\\|non-LDV\\|S", NAvar)] # unit NA, but ok, see issue #408 - if (length(NAvar) > 0) { - warning("These variables and units contain NA: ", paste(NAvar, collapse = ", ")) - } - - noUnit <- grep(" \\(.*\\)$", vars, value = TRUE, invert = TRUE) - if (length(noUnit) > 0) { - warning("These variables have no units: ", paste(noUnit, collapse = ", ")) - } +checkVariableNames <- function(vars) { + exception <- "^Services and Products\\|Transport\\|non-LDV\\|S" # unit NA, but ok, see issue #408 + vars <- grep(exception, vars, value = TRUE, invert = TRUE) + checkVarNames(vars) } diff --git a/README.md b/README.md index 0f7df4c1..ec64dcd0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.135.7** +R package **remind2**, version **1.135.8** [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2) [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds) @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues . +Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.135.8, . A BibTeX entry for LaTeX users is @@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is title = {remind2: The REMIND R package (2nd generation)}, author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann}, year = {2024}, - note = {R package version 1.135.7}, + note = {R package version 1.135.8}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/tests/testthat/test-checkVariableNames.R b/tests/testthat/test-checkVariableNames.R deleted file mode 100644 index f6e7ca56..00000000 --- a/tests/testthat/test-checkVariableNames.R +++ /dev/null @@ -1,12 +0,0 @@ -test_that("checkVariableNames works", { - fine <- c("PE (EJ)", "PE (NA/yr)", "FE|What (yr)", "FE|Electricity (EJ/yr)") - for (v in fine) { - expect_no_warning(checkVariableNames(v)) - } - wrong <- c("PE", "PE| (EJ)", "PE||Elec (EJ)", "PE||Elec", "PE (EJ)", "PE (NA)", - "NA|PE (EJ)", "PE|NA|What (EJ)", " PE (EJ)", "PE (EJ) ") - for (v in wrong) { - w <- capture_warnings(checkVariableNames(v)) - expect_true(length(w) > 0) - } -})