bugfix in aggregation weight AgCapLabourShare

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '6134590'
+ValidationKey: '6155934'
 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.10
-date-released: '2024-03-07'
+version: 0.3.11
+date-released: '2024-03-12'
 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.10
-Date: 2024-03-07
+Version: 0.3.11
+Date: 2024-03-12
 Authors@R:
  c(person("Debbora", "Leip", , "[email protected]", role = c("aut", "cre")),
  person("Edna", "Molina Bacca", role = "aut"))

R/calcAgCapLabourShare.R

@@ -34,8 +34,9 @@ calcAgCapLabourShare <- function() {
  if (any(missingYears > min(getYears(weight, as.integer = TRUE)))) {
  stop("Need to fix weight for new years not covered in factor costs dataset")
  }
+ minYear <- min(getYears(weight, as.integer = TRUE))
  weight <- magpiesort(add_columns(weight, dim = 2, addnm = paste0("y", missingYears)))
- weight[, missingYears, ] <- weight[, min(getYears(weight, as.integer = TRUE)), ]
+ weight[, missingYears, ] <- weight[, minYear, ]
 
  # Give 0 weigh to countries with unexpectedly high capital shares
  weight[c("BLZ", "CRI", "DOM", "HND", "JAM", "MEX", "NIC", "PAN", "SLV"), , ] <- 0

README.md

@@ -1,6 +1,6 @@
 # MADRaT based package on factor inputs
 
-R package **mrfactors**, version **0.3.10**
+R package **mrfactors**, version **0.3.11**
 
 [![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.10, <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.11, <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.10},
+ note = {R package version 0.3.11},
  url = {https://github.com/pik-piam/mrfactors},
 }
 ```