diff --git a/.buildlibrary b/.buildlibrary index c5f52de..6e0bea1 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '51962778' +ValidationKey: '52171290' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package .* was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 3360674..b398b28 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.60.1 -date-released: '2024-09-12' +version: 2.61.0 +date-released: '2024-09-23' abstract: Package contains routines to prepare data for validation exercises. authors: - family-names: Bodirsky diff --git a/DESCRIPTION b/DESCRIPTION index ee3117d..739635f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrvalidation Title: madrat data preparation for validation purposes -Version: 2.60.1 -Date: 2024-09-12 +Version: 2.61.0 +Date: 2024-09-23 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), person("Stephen", "Wirth", role = "aut"), diff --git a/README.md b/README.md index a5581e2..1fd40af 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat data preparation for validation purposes -R package **mrvalidation**, version **2.60.1** +R package **mrvalidation**, version **2.61.0** [![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.60.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 (URL: https://doi.org/10.5281/zenodo.4317826), R package version 2.61.0, . A BibTeX entry for LaTeX users is @@ -48,8 +48,8 @@ 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.60.1}, - url = {https://github.com/pik-piam/mrvalidation}, + note = {R package version 2.61.0}, doi = {10.5281/zenodo.4317826}, + url = {https://github.com/pik-piam/mrvalidation}, } ``` diff --git a/man/calcValidAgEmployment.Rd b/man/calcValidAgEmployment.Rd index ee463f5..91b5b68 100644 --- a/man/calcValidAgEmployment.Rd +++ b/man/calcValidAgEmployment.Rd @@ -4,7 +4,7 @@ \alias{calcValidAgEmployment} \title{calcValidAgEmployment} \usage{ -calcValidAgEmployment(datasource = "ILO", dataVersionILO = "Aug23") +calcValidAgEmployment(datasource = "ILO", dataVersionILO = "Aug24") } \arguments{ \item{datasource}{ILO for reporting aggregated employment in crop+livestock production, or ILO_FAO, which uses the diff --git a/man/calcValidAgFFGDP.Rd b/man/calcValidAgFFGDP.Rd index 006f724..098ee2b 100644 --- a/man/calcValidAgFFGDP.Rd +++ b/man/calcValidAgFFGDP.Rd @@ -13,7 +13,7 @@ calcValidAgFFGDP(datasource = "WDI") List of magpie object with results on country level, no weight, unit and description. } \description{ -validation for agricultural, fisheries, forestry value added gdp (Million 05USD) +validation for agricultural, fisheries, forestry value added gdp (Million 17USD) } \examples{ \dontrun{ diff --git a/man/calcValidCostsOverall.Rd b/man/calcValidCostsOverall.Rd index 82862a1..e95d106 100644 --- a/man/calcValidCostsOverall.Rd +++ b/man/calcValidCostsOverall.Rd @@ -14,7 +14,7 @@ List of magpie object with results on country level, no weight, unit and descrip } \description{ Returns historical values of the overall value of production for the Agricultural, -Forestry sectors, and fisheries (mio.05USD) +Forestry sectors, and fisheries (mio.17USD) } \examples{ \dontrun{ diff --git a/man/calcValidHourlyLaborCosts.Rd b/man/calcValidHourlyLaborCosts.Rd index 570bb3b..cdc5695 100644 --- a/man/calcValidHourlyLaborCosts.Rd +++ b/man/calcValidHourlyLaborCosts.Rd @@ -6,7 +6,7 @@ \usage{ calcValidHourlyLaborCosts( datasource = "ILO_completed", - dataVersionILO = "Aug23" + dataVersionILO = "Aug24" ) } \arguments{ diff --git a/man/calcValidPriceAgriculture.Rd b/man/calcValidPriceAgriculture.Rd index 7df9c3a..5b3b9ab 100644 --- a/man/calcValidPriceAgriculture.Rd +++ b/man/calcValidPriceAgriculture.Rd @@ -14,7 +14,7 @@ List with a magpie object with commodity prices on global and country level. } \description{ provides global prices from the IMPACT model projections, World Bank observations, and FAO -obersvations for MAgPIE commodities in $/tDM +obersvations for MAgPIE commodities in $2017/tDM } \examples{ diff --git a/man/calcValidTotalLaborCosts.Rd b/man/calcValidTotalLaborCosts.Rd index 8355ee6..e078834 100644 --- a/man/calcValidTotalLaborCosts.Rd +++ b/man/calcValidTotalLaborCosts.Rd @@ -4,7 +4,7 @@ \alias{calcValidTotalLaborCosts} \title{calcValidTotalLaborCosts} \usage{ -calcValidTotalLaborCosts(datasource = "USDA", dataVersionILO = "Aug23") +calcValidTotalLaborCosts(datasource = "USDA", dataVersionILO = "Aug24") } \arguments{ \item{datasource}{"USDA" (which uses FAO VoP and USDA cost shares) or "ILO" (which is based on ILO datasets and diff --git a/man/calcValidWageDevelopment.Rd b/man/calcValidWageDevelopment.Rd index 152df80..0ffd2cd 100644 --- a/man/calcValidWageDevelopment.Rd +++ b/man/calcValidWageDevelopment.Rd @@ -7,7 +7,7 @@ calcValidWageDevelopment( datasource = "ILO_completed", baseYear = 2000, - dataVersionILO = "Aug23" + dataVersionILO = "Aug24" ) } \arguments{ diff --git a/man/convertIMPACTIrrigInvCosts.Rd b/man/convertIMPACTIrrigInvCosts.Rd index 60770d9..ea757bc 100644 --- a/man/convertIMPACTIrrigInvCosts.Rd +++ b/man/convertIMPACTIrrigInvCosts.Rd @@ -12,7 +12,7 @@ convertIMPACTIrrigInvCosts(x) \value{ magpie object containing average annual baseline water-related investment cost on country-level - (in million 2005 USD per year) + (in million 2017 USD per year) } \description{ converts units and dimensions of average annual baseline