include WB Income groups region mapping

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '232464816'
+ValidationKey: '232508150'
 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: 'magpie4: MAgPIE outputs R package for MAgPIE version 4.x'
-version: 1.189.2
-date-released: '2023-07-10'
+version: 1.189.3
+date-released: '2023-07-12'
 abstract: Common output routines for extracting results from the MAgPIE framework
   (versions 4.x).
 authors:

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: magpie4
 Title: MAgPIE outputs R package for MAgPIE version 4.x
-Version: 1.189.2
-Date: 2023-07-10
+Version: 1.189.3
+Date: 2023-07-12
 Authors@R: c(
     person("Benjamin Leon", "Bodirsky", , "[email protected]", role = c("aut", "cre")),
     person("Florian", "Humpenoeder", , "[email protected]", role = "aut"),

R/processing.R

@@ -1,53 +1,47 @@
 #' @title processing
-#' @description Calculates MAgPIE disaggregated processing out of a gdx file 
-#' 
+#' @description Calculates MAgPIE disaggregated processing out of a gdx file
+#'
 #' @export
-#' 
+#'
 #' @param gdx GDX file
-#' @param file a file name the output should be written to using write.magpie
 #' @param level Level of regional aggregation ("reg", "glo", "regglo")
-#' @param products Selection of products (either by naming products, e.g. "tece", or naming a set,e.g."kcr")
 #' @param product_aggr aggregate over products or not (boolean)
 #' @param attributes dry matter: Mt ("dm"), gross energy: PJ ("ge"), reactive nitrogen: Mt ("nr"), phosphor: Mt ("p"), potash: Mt ("k"), wet matter: Mt ("wm"). Can also be a vector.
-#' @param type Demand type(s): "Food", "Feed", "Processing", "Material", "Bioenergy", "Seed", "Supply chain loss", "Domestic Balanceflow"; NULL returns all types 
+#' @param type Demand type(s): "Food", "Feed", "Processing", "Material", "Bioenergy", "Seed", "Supply chain loss", "Domestic Balanceflow"; NULL returns all types
 #' @param indicator process or secondary product output
 #' @details Demand definitions are equivalent to FAO CBS categories
 #' @return processing as MAgPIE object (Unit depends on attributes)
 #' @author David Chen, Benjamin Leon Bodirsky
 #' @importFrom magclass add_dimension dimOrder
 #' @examples
-#' 
+#'
 #'   \dontrun{
 #'     x <- processing(gdx = gdx, level="regglo", products="kcr", indicator="primary_to_process")
 #'   }
 #'
-processing<-function(gdx,file=NULL,level="reg",products=readGDX(gdx,"kall"),product_aggr=FALSE,attributes="dm",type=NULL, indicator = "secondary_from_primary"){
-
-
-  if (!all(products%in%readGDX(gdx,"kall"))){
-  products<-readGDX(gdx,"kall")
-}
+processing<-function(gdx, level="reg", product_aggr = FALSE, attributes="dm",
+                     type=NULL, indicator = "secondary_from_primary"){
+
+if(indicator=="primary_to_process"){
 
-if(indicator=="primary_to_process"){   
-
 #primary into process
-processdemand<-readGDX(gdx= gdx, "ov20_dem_processing", select = list(type="level"))
+processdemand <- readGDX(gdx = gdx, "ov20_dem_processing", select = list(type="level"))
 
-out<- dimOrder(processdemand, c(1,2))
-glo <- setItems(dimSums(out, dim=1),dim=1,"GLO")
+out<- dimOrder(processdemand, c(1, 2))
+glo <- setItems(dimSums(out, dim=1), dim=1, "GLO")
 out <- mbind(out, glo)
 }
 #primary to secondary
 
 else if(indicator == "secondary_from_primary"){
 processdemand<-readGDX(gdx= gdx, "ov20_dem_processing", select = list(type="level"))
-
-conv_factors <- readGDX(gdx = gdx, "f20_processing_conversion_factors")
 
-years = getYears(processdemand) 
-conv_factors1<- conv_factors[,years,]
+convFactors <- readGDX(gdx = gdx, "f20_processing_conversion_factors")
+
+years = getYears(processdemand)
+convFactors <- convFactors[,years,]
 
-out<- processdemand * dimSums(conv_factors1, dim=3.1)
+out<- processdemand * dimSums(convFactors, dim = 3.1)
 out<- dimSums(out, dim = 3.1)
 glo <- setItems(dimSums(out, dim=1),dim=1,"GLO")
 out <- mbind(out, glo)

README.md

@@ -1,6 +1,6 @@
 # MAgPIE outputs R package for MAgPIE version 4.x
 
-R package **magpie4**, version **1.189.2**
+R package **magpie4**, version **1.189.3**
 
 [![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 <bodirsky@
 
 To cite package **magpie4** in publications use:
 
-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 (2023). _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 1.189.2, <URL: https://github.com/pik-piam/magpie4>.
+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 (2023). _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 1.189.3, <URL: https://github.com/pik-piam/magpie4>.
 
 A BibTeX entry for LaTeX users is
 
@@ -48,7 +48,7 @@ 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 = {2023},
-  note = {R package version 1.189.2},
+  note = {R package version 1.189.3},
   doi = {10.5281/zenodo.1158582},
   url = {https://github.com/pik-piam/magpie4},
 }

inst/extdata/regionmappingWBIncomeGroups.csv

@@ -0,0 +1,228 @@
+iso3c,2000,2005,2010,2015,2020
+AFG,L,L,L,L,L
+ALB,LM,LM,UM,UM,UM
+DZA,LM,LM,UM,UM,LM
+ASM,UM,UM,UM,UM,UM
+AND,H,H,H,H,H
+AGO,L,LM,LM,UM,LM
+ATG,UM,H,UM,H,H
+ARG,UM,UM,UM,UM,UM
+ARM,L,LM,LM,LM,UM
+ABW,H,H,H,H,H
+AUS,H,H,H,H,H
+AUT,H,H,H,H,H
+AZE,L,LM,UM,UM,UM
+BHS,H,H,H,H,H
+BHR,UM,H,H,H,H
+BGD,L,L,L,LM,LM
+BRB,H,UM,H,H,H
+BLR,LM,LM,UM,UM,UM
+BEL,H,H,H,H,H
+BLZ,LM,UM,LM,UM,LM
+BEN,L,L,L,L,LM
+BMU,H,H,H,H,H
+BTN,L,L,LM,LM,LM
+BOL,LM,LM,LM,LM,LM
+BIH,LM,LM,UM,UM,UM
+BWA,UM,UM,UM,UM,UM
+BRA,UM,LM,UM,UM,UM
+VGB,..,..,..,H,H
+BRN,H,H,H,H,H
+BGR,LM,LM,UM,UM,UM
+BFA,L,L,L,L,L
+BDI,L,L,L,L,L
+CPV,LM,LM,LM,LM,LM
+KHM,L,L,L,LM,LM
+CMR,L,LM,LM,LM,LM
+CAN,H,H,H,H,H
+CYM,H,H,H,H,H
+CAF,L,L,L,L,L
+TCD,L,L,L,L,L
+CHI,H,H,H,H,H
+CHL,UM,UM,UM,H,H
+CHN,LM,LM,UM,UM,UM
+COL,LM,LM,UM,UM,UM
+COM,L,L,L,L,LM
+COD,L,L,L,L,L
+COG,L,LM,LM,LM,LM
+CRI,UM,UM,UM,UM,UM
+CIV,L,L,LM,LM,LM
+HRV,UM,UM,H,H,H
+CUB,LM,LM,UM,UM,UM
+CUW,..,..,H,H,H
+CYP,H,H,H,H,H
+CZE,UM,UM,H,H,H
+DNK,H,H,H,H,H
+DJI,LM,LM,LM,LM,LM
+DMA,UM,UM,UM,UM,UM
+DOM,LM,LM,UM,UM,UM
+ECU,LM,LM,UM,UM,UM
+EGY,LM,LM,LM,LM,LM
+SLV,LM,LM,LM,LM,LM
+GNQ,LM,UM,H,UM,UM
+ERI,L,L,L,L,L
+EST,UM,UM,H,H,H
+SWZ,LM,LM,LM,LM,LM
+ETH,L,L,L,L,L
+FRO,H,H,H,H,H
+FJI,LM,LM,LM,UM,UM
+FIN,H,H,H,H,H
+FRA,H,H,H,H,H
+PYF,H,H,H,H,H
+GAB,UM,UM,UM,UM,UM
+GMB,L,L,L,L,L
+GEO,L,LM,LM,UM,UM
+DEU,H,H,H,H,H
+GHA,L,L,LM,LM,LM
+GIB,..,..,H,H,H
+GRC,H,H,H,H,H
+GRL,H,H,H,H,H
+GRD,UM,UM,UM,UM,UM
+GUM,H,H,H,H,H
+GTM,LM,LM,LM,LM,UM
+GIN,L,L,L,L,L
+GNB,L,L,L,L,L
+GUY,LM,LM,LM,UM,UM
+HTI,L,L,L,L,LM
+HND,LM,LM,LM,LM,LM
+HKG,H,H,H,H,H
+HUN,UM,UM,H,H,H
+ISL,H,H,H,H,H
+IND,L,L,LM,LM,LM
+IDN,L,LM,LM,LM,LM
+IRN,LM,LM,UM,UM,LM
+IRQ,LM,LM,LM,UM,UM
+IRL,H,H,H,H,H
+IMN,UM,H,H,H,H
+ISR,H,H,H,H,H
+ITA,H,H,H,H,H
+JAM,LM,LM,UM,UM,UM
+JPN,H,H,H,H,H
+JOR,LM,LM,UM,UM,UM
+KAZ,LM,LM,UM,UM,UM
+KEN,L,L,L,LM,LM
+KIR,LM,LM,LM,LM,LM
+PRK,L,L,L,L,L
+KOR,UM,H,H,H,H
+XKX,..,..,LM,LM,UM
+KWT,H,H,H,H,H
+KGZ,L,L,L,LM,LM
+LAO,L,L,LM,LM,LM
+LVA,LM,UM,UM,H,H
+LBN,UM,UM,UM,UM,UM
+LSO,L,LM,LM,LM,LM
+LBR,L,L,L,L,L
+LBY,UM,UM,UM,UM,UM
+LIE,H,H,H,H,H
+LTU,LM,UM,UM,H,H
+LUX,H,H,H,H,H
+MAC,H,H,H,H,H
+MDG,L,L,L,L,L
+MWI,L,L,L,L,L
+MYS,UM,UM,UM,UM,UM
+MDV,LM,LM,UM,UM,UM
+MLI,L,L,L,L,L
+MLT,H,H,H,H,H
+MHL,LM,LM,LM,UM,UM
+MRT,L,L,LM,LM,LM
+MUS,UM,UM,UM,UM,UM
+MEX,UM,UM,UM,UM,UM
+FSM,LM,LM,LM,LM,LM
+MDA,L,LM,LM,LM,UM
+MCO,H,H,H,H,H
+MNG,L,L,LM,LM,LM
+MNE,..,..,UM,UM,UM
+MAR,LM,LM,LM,LM,LM
+MOZ,L,L,L,L,L
+MMR,L,L,L,LM,LM
+NAM,LM,LM,UM,UM,UM
+NRU,..,..,..,H,H
+NPL,L,L,L,L,LM
+NLD,H,H,H,H,H
+NCL,H,H,H,H,H
+NZL,H,H,H,H,H
+NIC,L,LM,LM,LM,LM
+NER,L,L,L,L,L
+NGA,L,L,LM,LM,LM
+MKD,LM,LM,UM,UM,UM
+MNP,H,UM,H,H,H
+NOR,H,H,H,H,H
+OMN,UM,UM,H,H,H
+PAK,L,L,LM,LM,LM
+PLW,UM,UM,UM,UM,H
+PAN,UM,UM,UM,UM,UM
+PNG,LM,L,LM,LM,LM
+PRY,LM,LM,LM,UM,UM
+PER,LM,LM,UM,UM,UM
+PHL,LM,LM,LM,LM,LM
+POL,UM,UM,H,H,H
+PRT,H,H,H,H,H
+PRI,UM,H,H,H,H
+QAT,H,H,H,H,H
+ROU,LM,UM,UM,UM,UM
+RUS,LM,UM,UM,UM,UM
+RWA,L,L,L,L,L
+WSM,LM,LM,LM,LM,LM
+SMR,H,H,H,H,H
+STP,L,L,LM,LM,LM
+SAU,UM,H,H,H,H
+SEN,L,L,LM,L,LM
+SRB,..,..,UM,UM,UM
+SYC,UM,UM,UM,H,H
+SLE,L,L,L,L,L
+SGP,H,H,H,H,H
+SXM,..,..,H,H,H
+SVK,UM,UM,H,H,H
+SVN,H,H,H,H,H
+SLB,L,L,LM,LM,LM
+SOM,L,L,L,L,L
+ZAF,UM,UM,UM,UM,UM
+SSD,..,..,..,L,L
+ESP,H,H,H,H,H
+LKA,LM,LM,LM,LM,LM
+KNA,UM,UM,UM,H,H
+LCA,UM,UM,UM,UM,UM
+MAF,..,..,H,H,H
+VCT,LM,UM,UM,UM,UM
+SDN,L,L,LM,LM,L
+SUR,LM,LM,UM,UM,UM
+SWE,H,H,H,H,H
+CHE,H,H,H,H,H
+SYR,LM,LM,LM,LM,L
+TWN,H,H,H,H,H
+TJK,L,L,L,LM,LM
+TZA,L,L,L,L,LM
+THA,LM,LM,UM,UM,UM
+TLS,..,L,LM,LM,LM
+TGO,L,L,L,L,L
+TON,LM,LM,LM,LM,UM
+TTO,UM,UM,H,H,H
+TUN,LM,LM,UM,LM,LM
+TUR,UM,UM,UM,UM,UM
+TKM,LM,LM,LM,UM,UM
+TCA,..,..,H,H,H
+TUV,..,..,LM,UM,UM
+UGA,L,L,L,L,L
+UKR,L,LM,LM,LM,LM
+ARE,H,H,H,H,H
+GBR,H,H,H,H,H
+USA,H,H,H,H,H
+URY,UM,UM,UM,H,H
+UZB,L,L,LM,LM,LM
+VUT,LM,LM,LM,LM,LM
+VEN,UM,UM,UM,UM,
+VNM,L,L,LM,LM,LM
+VIR,H,H,H,H,H
+PSE,LM,LM,LM,LM,LM
+YEM,L,L,LM,LM,L
+ZMB,L,L,LM,LM,LM
+ZWE,L,L,L,L,LM
+,,,,,
+,,,,,
+,,,,,
+CSK,,,,,
+MYT,UM,UM,UM,,
+ANT,H,H,,,
+YUG,LM,LM,,,
+SUN,,,,,
+YUGf,,,,,

inst/extdata/variablemappingICP.csv

@@ -0,0 +1,30 @@
+BHName,k
+Milk products,livst_milk
+Eggs,livst_egg
+Fruit,others
+Bread and cereals,tece
+Bread and cereals,maiz
+Bread and cereals,trce
+Bread and cereals,rice_pro
+Bread and cereals,brans
+Meat,livst_rum
+Meat,livst_pig
+Meat,livst_chick
+Meat,fish
+Processed,oils
+Processed,oilpalm
+Processed,sugar
+Processed,molasses
+Processed,oilcakes
+Processed,alcohol
+Processed,scp
+Vegetables,soybean
+Vegetables,rapeseed
+Vegetables,groundnut
+Vegetables,sunflower
+Vegetables,potato
+Vegetables,puls_pro
+Vegetables,cassav_sp
+Vegetables,sugr_cane
+Vegetables,sugr_beet
+Vegetables,Vegetables