update structuremappingIO_outputs

.gitignore

@@ -3,6 +3,6 @@
 .RData
 .Ruserdata
 .positai
-mrcommons.Rproj
+*.Rproj
 .Rproj.user
-.positai
+

.lintr

@@ -1,2 +1,2 @@
-linters: lucode2::lintrRules()
+linters: lucode2::lintrRules(modification = list(pipe_consistency_linter = pipe_consistency_linter(pipe = c("auto"))))
 encoding: "UTF-8"

DESCRIPTION

@@ -56,6 +56,7 @@ Depends:
     mstools (>= 0.6.0),
     R (>= 2.10.0)
 Imports:
+    assertr,
     countrycode,
     data.table,
     dplyr,

NAMESPACE

@@ -26,6 +26,7 @@ export(readFeedShareReg)
 export(readHoulton2018)
 export(readJRC_IDEES)
 export(toolCalcIEAfromStructureMappingPEFE)
+export(toolFixIEAdataForIndustrySubsectors)
 export(toolPregnant)
 export(toolSplitBiomass)
 import(GDPuc)
@@ -35,6 +36,8 @@ import(mrdrivers)
 import(mrfaocore)
 import(mrlandcore)
 import(mstools)
+importFrom(assertr,assert)
+importFrom(assertr,not_na)
 importFrom(countrycode,countrycode)
 importFrom(data.table,":=")
 importFrom(data.table,as.data.table)
@@ -44,11 +47,13 @@ importFrom(dplyr,.data)
 importFrom(dplyr,`%>%`)
 importFrom(dplyr,across)
 importFrom(dplyr,all_of)
+importFrom(dplyr,anti_join)
 importFrom(dplyr,arrange)
 importFrom(dplyr,bind_cols)
 importFrom(dplyr,bind_rows)
 importFrom(dplyr,count)
 importFrom(dplyr,distinct)
+importFrom(dplyr,everything)
 importFrom(dplyr,filter)
 importFrom(dplyr,full_join)
 importFrom(dplyr,group_by)
@@ -65,7 +70,9 @@ importFrom(dplyr,relocate)
 importFrom(dplyr,rename)
 importFrom(dplyr,right_join)
 importFrom(dplyr,select)
+importFrom(dplyr,semi_join)
 importFrom(dplyr,summarise)
+importFrom(dplyr,ungroup)
 importFrom(hdf5r,h5file)
 importFrom(luscale,getAggregationMatrix)
 importFrom(luscale,groupAggregate)
@@ -138,8 +145,13 @@ importFrom(purrr,walk)
 importFrom(quitte,add_countrycode_)
 importFrom(quitte,as.quitte)
 importFrom(quitte,calc_addVariable)
+importFrom(quitte,cartesian)
 importFrom(quitte,character.data.frame)
 importFrom(quitte,inline.data.frame)
+importFrom(quitte,interpolate_missing_periods)
+importFrom(quitte,interpolate_missing_periods_)
+importFrom(quitte,overwrite)
+importFrom(quitte,sum_total_)
 importFrom(raster,"res<-")
 importFrom(raster,aggregate)
 importFrom(raster,area)
@@ -183,14 +195,18 @@ importFrom(terra,tmpFiles)
 importFrom(terra,vect)
 importFrom(tibble,as_tibble)
 importFrom(tibble,tibble)
+importFrom(tibble,tribble)
 importFrom(tidyr,complete)
+importFrom(tidyr,crossing)
 importFrom(tidyr,drop_na)
 importFrom(tidyr,expand_grid)
+importFrom(tidyr,gather)
 importFrom(tidyr,matches)
 importFrom(tidyr,nesting)
 importFrom(tidyr,pivot_longer)
 importFrom(tidyr,replace_na)
 importFrom(tidyr,separate_wider_delim)
+importFrom(tidyr,spread)
 importFrom(tidyr,starts_with)
 importFrom(tidyr,unite)
 importFrom(tidyr,unnest)

R/calcIOEdgeBuildings.R

@@ -29,8 +29,6 @@ calcIOEdgeBuildings <- function(subtype = c("output_EDGE", "output_EDGE_building
   subtype <- match.arg(subtype)
   ieaVersion <- match.arg(ieaVersion)
 
-
-
   # READ -----------------------------------------------------------------------
 
   # convert from ktoe to EJ
@@ -40,9 +38,13 @@ calcIOEdgeBuildings <- function(subtype = c("output_EDGE", "output_EDGE_building
   ) * 4.1868e-5
 
 
+  # apply IEA data postprocessing
+  # TODO adjust the mapping
+  data <- toolFixIEAdataForIndustrySubsectors(data)
 
   # AGGREGATE ------------------------------------------------------------------
 
+  # TODO separate the mapping
   target <- switch(subtype,
     output_EDGE = "EDGEitems",
     output_EDGE_buildings = "EDGE_buildings"