removed VoP data for cases with too few crops reported

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '6155934'
+ValidationKey: '6179784'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

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.11
-date-released: '2024-03-12'
+version: 0.3.12
+date-released: '2024-03-25'
 abstract: This package provides functions for MAgPIE input data on factor inputs to
   agricultural production (with a focus on capital and labor).
 authors:

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mrfactors
 Title: MADRaT based package on factor inputs
-Version: 0.3.11
-Date: 2024-03-12
+Version: 0.3.12
+Date: 2024-03-25
 Authors@R:
     c(person("Debbora", "Leip", , "[email protected]", role = c("aut", "cre")),
       person("Edna", "Molina Bacca", role = "aut"))

R/calcHourlyLaborCosts.R

@@ -124,7 +124,9 @@ calcHourlyLaborCosts <- function(datasource = "USDA_FAO", dataVersionILO = "Aug2
         totalLaborCosts <- totalLaborCosts[, , str_to_title(sector)]
       } else {
         agEmpl <- dimSums(agEmpl, dim = 3)
+        incl <- totalLaborCosts[, , "Livestock"] * totalLaborCosts[, , "Crops"]
         totalLaborCosts <- dimSums(totalLaborCosts, dim = 3)
+        totalLaborCosts[incl == 0] <- 0
       }
 
       # calculate hourly labor costs

R/calcLaborCosts.R

@@ -128,8 +128,12 @@ calcLaborCosts <- function(datasource = "ILO", dataVersionILO = "Aug23", subsect
     # estimate total labor costs as share of VoP
     out <- vopAg[, years, ] * shares
 
-    # aggregate if subsectors is FALSE
-    if (isFALSE(subsectors)) out <- dimSums(out, dim = 3)
+    # aggregate if subsectors is FALSE, but only in cases where both crops and livestock are included
+    if (isFALSE(subsectors)) {
+      incl <- out[, , "Livestock"] * out[, , "Crops"]
+      out <- dimSums(out, dim = 3)
+      out[incl == 0] <- 0
+    }
 
   } else if (datasource == "GTAP") {
 

R/calcVoPcrops.R

@@ -83,6 +83,12 @@ calcVoPcrops <- function(fillGaps = TRUE) {
 
   vopKcrAggregated[!is.finite(vopKcrAggregated)] <- 0
 
+  # we exclude all year-country combinations for which less than 5 crop categories are reported
+  repValues <- dimSums(vopKcrAggregated > 0, dim = 3)
+  l5 <- repValues < 5
+  vopKcrAggregated[l5] <- 0
+
+
   weight <- NULL
   units <- "mio USD05 MER"
 

README.md

@@ -1,6 +1,6 @@
 # MADRaT based package on factor inputs
 
-R package **mrfactors**, version **0.3.11**
+R package **mrfactors**, version **0.3.12**
 
 [![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 <[email protected]
 
 To cite package **mrfactors** in publications use:
 
-Leip D, Molina Bacca E (2024). _mrfactors: MADRaT based package on factor inputs_. R package version 0.3.11, <URL: https://github.com/pik-piam/mrfactors>.
+Leip D, Molina Bacca E (2024). _mrfactors: MADRaT based package on factor inputs_. R package version 0.3.12, <URL: https://github.com/pik-piam/mrfactors>.
 
 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.11},
+  note = {R package version 0.3.12},
   url = {https://github.com/pik-piam/mrfactors},
 }
 ```