From ac7876e14cf5a619674e69868749dd1bdba19525 Mon Sep 17 00:00:00 2001 From: Kristine Karstens Date: Fri, 5 Jul 2024 20:49:38 +0200 Subject: [PATCH] bugfix ValidIncome --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 6 +++--- R/calcValidIncome.R | 2 +- README.md | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 05809f3..270cc4b 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '51534990' +ValidationKey: '51601536' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package .* was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 25457eb..c8ba0b1 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: 'mrvalidation: madrat data preparation for validation purposes' -version: 2.59.1 -date-released: '2024-06-16' +version: 2.59.2 +date-released: '2024-07-04' abstract: Package contains routines to prepare data for validation exercises. authors: - family-names: Bodirsky diff --git a/DESCRIPTION b/DESCRIPTION index 94cc401..791b9d7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrvalidation Title: madrat data preparation for validation purposes -Version: 2.59.1 -Date: 2024-06-16 +Version: 2.59.2 +Date: 2024-07-04 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), person("Stephen", "Wirth", role = "aut"), @@ -60,4 +60,4 @@ Suggests: covr Encoding: UTF-8 LazyData: no -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 diff --git a/R/calcValidIncome.R b/R/calcValidIncome.R index afa2152..676a829 100644 --- a/R/calcValidIncome.R +++ b/R/calcValidIncome.R @@ -50,7 +50,7 @@ calcValidIncome <- function(datasource = "WDI-MI_SSPs-MI") { popWeights <- add_dimension(popWeights, dim = 3.2, add = "model", nm = datasource) noWeights <- popWeights - noWeights[] <- 0 + noWeights[] <- NA weight <- NULL weight <- mbind(weight, add_dimension(noWeights, dim = 3.3, add = "variable", nm = names[1])) diff --git a/README.md b/README.md index b56da32..90615a7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat data preparation for validation purposes -R package **mrvalidation**, version **2.59.1** +R package **mrvalidation**, version **2.59.2** [![CRAN status](https://www.r-pkg.org/badges/version/mrvalidation)](https://cran.r-project.org/package=mrvalidation) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4317826.svg)](https://doi.org/10.5281/zenodo.4317826) [![R build status](https://github.com/pik-piam/mrvalidation/workflows/check/badge.svg)](https://github.com/pik-piam/mrvalidation/actions) [![codecov](https://codecov.io/gh/pik-piam/mrvalidation/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrvalidation) [![r-universe](https://pik-piam.r-universe.dev/badges/mrvalidation)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky , R package version 2.59.1, . +Bodirsky B, Wirth S, Karstens K, Humpenoeder F, Stevanovic M, Mishra A, Biewald A, Weindl I, Beier F, Chen D, Crawford M, Leip D, Molina Bacca E, Kreidenweis U, W. Yalew A, von Jeetze P, Wang X, Dietrich J, Alves M (2024). _mrvalidation: madrat data preparation for validation purposes_. doi:10.5281/zenodo.4317826 , R package version 2.59.2, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrvalidation: madrat data preparation for validation purposes}, author = {Benjamin Leon Bodirsky and Stephen Wirth and Kristine Karstens and Florian Humpenoeder and Mishko Stevanovic and Abhijeet Mishra and Anne Biewald and Isabelle Weindl and Felicitas Beier and David Chen and Michael Crawford and Debbora Leip and Edna {Molina Bacca} and Ulrich Kreidenweis and Amsalu {W. Yalew} and Patrick {von Jeetze} and Xiaoxi Wang and Jan Philipp Dietrich and Marcos Alves}, year = {2024}, - note = {R package version 2.59.1}, + note = {R package version 2.59.2}, doi = {10.5281/zenodo.4317826}, url = {https://github.com/pik-piam/mrvalidation}, }