From 92048ce198b5b955121c7b82179ac5d6488e2afe Mon Sep 17 00:00:00 2001 From: Debbora Leip Date: Thu, 7 Mar 2024 13:48:30 +0100 Subject: [PATCH] another bugfix in calcValidFactorReqShares --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/calcValidFactorReqShares.R | 4 +++- README.md | 6 +++--- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 475e87e..1f3dfbd 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '50738996' +ValidationKey: '50758785' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index fccdcfe..09e4a65 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: 'mrvalidation: madrat data preparation for validation purposes' -version: 2.56.4 +version: 2.56.5 date-released: '2024-03-07' abstract: Package contains routines to prepare data for validation exercises. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 4924861..44e99d2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrvalidation Title: madrat data preparation for validation purposes -Version: 2.56.4 +Version: 2.56.5 Date: 2024-03-07 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/calcValidFactorReqShares.R b/R/calcValidFactorReqShares.R index 8074a1f..f85a536 100644 --- a/R/calcValidFactorReqShares.R +++ b/R/calcValidFactorReqShares.R @@ -33,7 +33,9 @@ calcValidFactorReqShares <- function(subtype = "crop") { # production as weight (0 weight to countries with unexpectedly high capital shares) weight <- dimSums(collapseDim(calcOutput("Production", aggregate = FALSE)[, , "dm"]), dim = 3.1) weight[c("BLZ", "CRI", "DOM", "HND", "JAM", "MEX", "NIC", "PAN", "SLV"), , ] <- 0 - weight <- weight[, getItems(out, dim = 2), ] + years <- intersect(getYears(weight), getYears(out)) + weight <- weight[, years, ] + out <- out[, years, ] weight[out[, , "Capital", pmatch = TRUE] == 0] <- 0 diff --git a/README.md b/README.md index e38d322..fe764c2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat data preparation for validation purposes -R package **mrvalidation**, version **2.56.4** +R package **mrvalidation**, version **2.56.5** [![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 . +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 (URL: https://doi.org/10.5281/zenodo.4317826), R package version 2.56.5, . 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.56.4}, + note = {R package version 2.56.5}, doi = {10.5281/zenodo.4317826}, url = {https://github.com/pik-piam/mrvalidation}, }