From 769a6f42d36c0e5d3177115f8eeecce4b9bc1bcd Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Thu, 24 Aug 2023 14:30:04 +0200 Subject: [PATCH] increment versions --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- README.md | 6 +++--- tests/testthat/test-convGDX2mif.R | 9 +++++---- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 4557ceee..baac1a66 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '218481543' +ValidationKey: '218501136' 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 33e2ea7e..ba6a6550 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.115.1 +version: 1.115.2 date-released: '2023-08-24' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index d3a1548c..36507e16 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.115.1 +Version: 1.115.2 Date: 2023-08-24 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), diff --git a/README.md b/README.md index 5e5e9282..6eed16a0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.115.1** +R package **remind2**, version **1.115.2** [![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, 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 (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.115.2, . 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 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}, year = {2023}, - note = {R package version 1.115.1}, + note = {R package version 1.115.2}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/tests/testthat/test-convGDX2mif.R b/tests/testthat/test-convGDX2mif.R index 46967780..e3222fc0 100644 --- a/tests/testthat/test-convGDX2mif.R +++ b/tests/testthat/test-convGDX2mif.R @@ -60,16 +60,17 @@ test_that("Test if REMIND reporting is produced as it should and check data inte numberOfMifs <- 0 for (gdxPath in gdxPaths) { numberOfMifs <- numberOfMifs + 1 - message("Running convGDX2MIF(", gdxPath, ") and checking integrity ..") + + message("Running convGDX2MIF(", gdxPath, ")...") mifContent <- convGDX2MIF(gdxPath, gdx_refpolicycost = gdxPath) + message("Checking integrity of created MIF...") sumChecks <- piamInterfaces::checkSummations( mifFile = mifContent, outputDirectory = NULL, summationsFile = "extractVariableGroups") %>% - mutate(!!sym("diff") := abs(!!sym("diff"))) %>% - filter(!!sym("diff") > 0.00001) + filter(abs(!!sym("reldiff")) >= 1, abs(!!sym("diff")) >= 0.001) if (nrow(sumChecks) > 0) { - warning("Some summation checks have failed! Run piamInterfaces::checkSummations") + warning("Some summation checks have revealed significant gaps! Run piamInterfaces::checkSummations") } magclass::write.report(