From 55a789c0d2d6f5013e5bc2187df68c6e5a856026 Mon Sep 17 00:00:00 2001 From: Edna Johanna Molina Bacca Date: Tue, 11 Jun 2024 13:34:54 +0200 Subject: [PATCH 1/2] Suthor update --- CITATION.cff | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CITATION.cff b/CITATION.cff index 2ae5809..30c6768 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -64,6 +64,8 @@ authors: given-names: Markus - family-names: Vartika given-names: Singh +- family-names: Edna Johanna + given-names: Molina Bacca license: LGPL-3.0 keywords: ~ repository-code: https://github.com/pik-piam/magpie4 From 1f1c7a71e92c50e0f02655b9c932502b7b0b8532 Mon Sep 17 00:00:00 2001 From: emolinab Date: Tue, 6 Aug 2024 17:22:05 +0200 Subject: [PATCH 2/2] reportFit missing level and authorship change --- .buildlibrary | 2 +- CITATION.cff | 6 ++---- DESCRIPTION | 4 ++-- R/reportFit.R | 2 +- README.md | 8 ++++---- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index a767dc6..6c6ed71 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '5661824' +ValidationKey: '5683185' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 345c2ae..be3a355 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: 'magpie4: MAgPIE outputs R package for MAgPIE version 4.x' -version: 2.8.4 -date-released: '2024-08-01' +version: 2.8.5 +date-released: '2024-08-06' abstract: Common output routines for extracting results from the MAgPIE framework (versions 4.x). authors: @@ -64,8 +64,6 @@ authors: given-names: Markus - family-names: Vartika given-names: Singh -- family-names: Edna Johanna - given-names: Molina Bacca license: LGPL-3.0 repository-code: https://github.com/pik-piam/magpie4 doi: 10.5281/zenodo.1158582 diff --git a/DESCRIPTION b/DESCRIPTION index 0f5dca2..209993e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: magpie4 Title: MAgPIE outputs R package for MAgPIE version 4.x -Version: 2.8.4 -Date: 2024-08-01 +Version: 2.8.5 +Date: 2024-08-06 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), person("Florian", "Humpenoeder", , "humpenoeder@pik-potsdam.de", role = "aut"), diff --git a/R/reportFit.R b/R/reportFit.R index bd5acef..9cc17b7 100644 --- a/R/reportFit.R +++ b/R/reportFit.R @@ -55,7 +55,7 @@ reportFit<-function(gdx,type="MAPE", level="cell"){ if (level == "cell"){ a <- cellularFit(gdx, file=NULL, level=level, statistic=type,variable="crop",dataset="LUH2",water_aggr =TRUE) a[!is.finite(a)]<-0 - getNames(a)<-paste0("Fit|Land Cover|Cropland|",reportingnames(getNames(a))," (",Unit,")") + getNames(a)<-paste0("Fit|",levelName,"|Land Cover|Cropland|",reportingnames(getNames(a))," (",Unit,")") a<-a[,getYears(x),] } else if (level == "grid") { a <- NULL diff --git a/README.md b/README.md index f9c601e..8cadfea 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MAgPIE outputs R package for MAgPIE version 4.x -R package **magpie4**, version **2.8.4** +R package **magpie4**, version **2.8.5** [![CRAN status](https://www.r-pkg.org/badges/version/magpie4)](https://cran.r-project.org/package=magpie4) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158582.svg)](https://doi.org/10.5281/zenodo.1158582) [![R build status](https://github.com/pik-piam/magpie4/workflows/check/badge.svg)](https://github.com/pik-piam/magpie4/actions) [![codecov](https://codecov.io/gh/pik-piam/magpie4/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/magpie4) [![r-universe](https://pik-piam.r-universe.dev/badges/magpie4)](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.8.4, . +Bodirsky B, Humpenoeder F, Dietrich J, Stevanovic M, Weindl I, Karstens K, Wang X, Mishra A, Beier F, Breier J, Yalew A, Chen D, Biewald A, Wirth S, von Jeetze P, Leip D, Crawford M, Alves M (2024). _magpie4: MAgPIE outputs R package for MAgPIE version 4.x_. doi: 10.5281/zenodo.1158582 (URL: https://doi.org/10.5281/zenodo.1158582), R package version 2.8.5, . A BibTeX entry for LaTeX users is @@ -48,8 +48,8 @@ A BibTeX entry for LaTeX users is title = {magpie4: MAgPIE outputs R package for MAgPIE version 4.x}, author = {Benjamin Leon Bodirsky and Florian Humpenoeder and Jan Philipp Dietrich and Miodrag Stevanovic and Isabelle Weindl and Kristine Karstens and Xiaoxi Wang and Abhijeet Mishra and Felicitas Beier and Jannes Breier and Amsalu Woldie Yalew and David Chen and Anne Biewald and Stephen Wirth and Patrick {von Jeetze} and Debbora Leip and Michael Crawford and Marcos Alves}, year = {2024}, - note = {R package version 2.8.4}, - url = {https://github.com/pik-piam/magpie4}, + note = {R package version 2.8.5}, doi = {10.5281/zenodo.1158582}, + url = {https://github.com/pik-piam/magpie4}, } ```