From 6e79d8fba34c2c6214152659557e0ad9aaff787d Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Thu, 26 Oct 2023 08:53:25 +0200 Subject: [PATCH 1/2] fix regression of industry per-capita Value Added --- R/EDGE-Industry.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/EDGE-Industry.R b/R/EDGE-Industry.R index ec783fa9..f2f19d53 100644 --- a/R/EDGE-Industry.R +++ b/R/EDGE-Industry.R @@ -1476,7 +1476,7 @@ calcIndustry_Value_Added <- function(subtype = 'physical', nls(formula = manufacturing / population ~ a * exp(b / GDPpC), data = regression_data %>% filter(.data$region == r, - 'Total' != .data$iso3c), + 'Total' == .data$iso3c), start = list(a = 1000, b = -2000), trace = FALSE) %>% tidy() %>% From 8e21ebcb7941c371933a7702a2d53895dacafdd4 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Thu, 26 Oct 2023 09:03:11 +0200 Subject: [PATCH 2/2] lucode hubbub --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index a5711bf3..e472ed7b 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '33483600' +ValidationKey: '33513480' 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 c3b94686..f1cbc1b4 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: 'mrremind: MadRat REMIND Input Data Package' -version: 0.170.4 -date-released: '2023-10-20' +version: 0.170.5 +date-released: '2023-10-26' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index bfd67861..bdbb1e99 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.170.4 -Date: 2023-10-20 +Version: 0.170.5 +Date: 2023-10-26 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), diff --git a/README.md b/README.md index d39e0db7..af22041b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.170.4** +R package **mrremind**, version **0.170.5** [![CRAN status](https://www.r-pkg.org/badges/version/mrremind)](https://cran.r-project.org/package=mrremind) [![R build status](https://github.com/pik-piam/mrremind/workflows/check/badge.svg)](https://github.com/pik-piam/mrremind/actions) [![codecov](https://codecov.io/gh/pik-piam/mrremind/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrremind) [![r-universe](https://pik-piam.r-universe.dev/badges/mrremind)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Lavinia Baumstark . +Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R (2023). _mrremind: MadRat REMIND Input Data Package_. R package version 0.170.5, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrremind: MadRat REMIND Input Data Package}, author = {Lavinia Baumstark and Renato Rodrigues and Antoine Levesque and Julian Oeser and Christoph Bertram and Ioanna Mouratiadou and Aman Malik and Felix Schreyer and Bjoern Soergel and Marianna Rottoli and Abhijeet Mishra and Alois Dirnaichner and Michaja Pehl and Anastasis Giannousakis and David Klein and Jessica Strefler and Lukas Feldhaus and Regina Brecha and Sebastian Rauner and Jan Philipp Dietrich and Stephen Bi and Falk Benke and Pascal Weigmann and Oliver Richters and Robin Hasse and Sophie Fuchs and Rahel Mandaroux}, year = {2023}, - note = {R package version 0.170.4}, + note = {R package version 0.170.5}, url = {https://github.com/pik-piam/mrremind}, } ```