From 8a2d4f22901473299a7f64d7a3dfdd710e445c9d Mon Sep 17 00:00:00 2001 From: Debbora Leip Date: Thu, 7 Mar 2024 10:20:28 +0100 Subject: [PATCH] fix aggregation weight in calcAgCapLabourShare --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/calcAgCapLabourShare.R | 13 ++++++++++++- README.md | 6 +++--- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index b0d6c66..aea51a2 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '771732' +ValidationKey: '6134590' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index e7e0625..e08cb8c 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: 'mrfactors: MADRaT based package on factor inputs' -version: 0.3.9 -date-released: '2024-03-06' +version: 0.3.10 +date-released: '2024-03-07' abstract: This package provides functions for MAgPIE input data on factor inputs to agricultural production (with a focus on capital and labor). authors: diff --git a/DESCRIPTION b/DESCRIPTION index 5636b0e..16a122b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrfactors Title: MADRaT based package on factor inputs -Version: 0.3.9 -Date: 2024-03-06 +Version: 0.3.10 +Date: 2024-03-07 Authors@R: c(person("Debbora", "Leip", , "leip@pik-potsdam.de", role = c("aut", "cre")), person("Edna", "Molina Bacca", role = "aut")) diff --git a/R/calcAgCapLabourShare.R b/R/calcAgCapLabourShare.R index b5e2e16..9bb769b 100644 --- a/R/calcAgCapLabourShare.R +++ b/R/calcAgCapLabourShare.R @@ -24,7 +24,18 @@ calcAgCapLabourShare <- function() { # In case of values different to finite makes them 0 fractionCapital[!is.finite(fractionCapital)] <- 0 - weight <- dimSums(collapseDim(calcOutput("Production", aggregate = FALSE)[, , "dm"]), dim = 3.1) + # factor costs as weight + factorCostsCrops <- dimSums(calcOutput("FactorCostsCrops", aggregate = FALSE), dim = 3.1) + factorCostsLivst <- dimSums(calcOutput("FactorCostsLivst", aggregate = FALSE), dim = 3.1) + weight <- factorCostsCrops + factorCostsLivst + + # add missing years to weight + missingYears <- setdiff(getYears(fractionCapital, as.integer = TRUE), getYears(weight, as.integer = TRUE)) + if (any(missingYears > min(getYears(weight, as.integer = TRUE)))) { + stop("Need to fix weight for new years not covered in factor costs dataset") + } + weight <- magpiesort(add_columns(weight, dim = 2, addnm = paste0("y", missingYears))) + weight[, missingYears, ] <- weight[, min(getYears(weight, as.integer = TRUE)), ] # Give 0 weigh to countries with unexpectedly high capital shares weight[c("BLZ", "CRI", "DOM", "HND", "JAM", "MEX", "NIC", "PAN", "SLV"), , ] <- 0 diff --git a/README.md b/README.md index 0d06183..f3eb7a0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MADRaT based package on factor inputs -R package **mrfactors**, version **0.3.9** +R package **mrfactors**, version **0.3.10** [![CRAN status](https://www.r-pkg.org/badges/version/mrfactors)](https://cran.r-project.org/package=mrfactors) [![R build status](https://github.com/pik-piam/mrfactors/workflows/check/badge.svg)](https://github.com/pik-piam/mrfactors/actions) [![codecov](https://codecov.io/gh/pik-piam/mrfactors/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrfactors) [![r-universe](https://pik-piam.r-universe.dev/badges/mrfactors)](https://pik-piam.r-universe.dev/builds) @@ -38,7 +38,7 @@ In case of questions / problems please contact Debbora Leip . +Leip D, Molina Bacca E (2024). _mrfactors: MADRaT based package on factor inputs_. R package version 0.3.10, . A BibTeX entry for LaTeX users is @@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is title = {mrfactors: MADRaT based package on factor inputs}, author = {Debbora Leip and Edna {Molina Bacca}}, year = {2024}, - note = {R package version 0.3.9}, + note = {R package version 0.3.10}, url = {https://github.com/pik-piam/mrfactors}, } ```