Merge pull request #344 from USEPA/waste_disagg_update

Adds Detail waste disaggregation for 2017 schema

Author: bl-young

R/DisaggregateFunctions.R

@@ -132,6 +132,8 @@ disaggregateSetup <- function (model, configpaths = NULL, setupType = "Disaggreg
                                             sep = ",", header = TRUE,
                                             stringsAsFactors = FALSE,
                                             check.names = FALSE)
+    colnames(spec$NAICSSectorCW)[which(
+      names(spec$NAICSSectorCW) %in% c("NAICS_2012_Code", "NAICS_2017_Code"))] <- "NAICS_Code"
 
     newNames <- unique(data.frame("SectorCode" = spec$NAICSSectorCW$USEEIO_Code,
                                   "SectorName" = spec$NAICSSectorCW$USEEIO_Name,
@@ -647,9 +649,9 @@ disaggregateSatelliteSubsetByRatio <- function(sattable, disagg, allocating_sect
 disaggregateSatelliteTable <- function (disagg, tbs, sat_spec) {
   sattable <- tbs
   # identify NAICS that require further disaggregation
-  naics <- disagg$NAICSSectorCW[c('NAICS_2012_Code','USEEIO_Code')]
-  codes <- unique(naics[duplicated(naics$NAICS_2012_Code),]$NAICS_2012_Code)
-  naics <- naics[which(naics$NAICS_2012_Code %in% codes),]
+  naics <- disagg$NAICSSectorCW[c('NAICS_Code','USEEIO_Code')]
+  codes <- unique(naics[duplicated(naics$NAICS_Code),]$NAICS_Code)
+  naics <- naics[which(naics$NAICS_Code %in% codes),]
 
   original_code <- gsub("/.*", "", disagg$OriginalSectorCode)
   codes <- c(original_code, codes)
@@ -1030,13 +1032,13 @@ disaggregateMasterCrosswalk <- function (model, disagg){
   # used to determine the length of the sector codes. E.g., detail would be 6, while summary would generally
   # be 3 though variable, and sector would be variable
   secLength <- regexpr(pattern ='/',disagg$OriginalSectorCode) - 1
-  cw <- disagg$NAICSSectorCW[, c('NAICS_2012_Code','USEEIO_Code')]
+  cw <- disagg$NAICSSectorCW[, c('NAICS_Code','USEEIO_Code')]
   # For all rows in the USEEIO_Code column, remove all characters after (and including) "/"
   cw$USEEIO_Code <- sub("/.*","",cw$USEEIO_Code)
 
   # Update original sector codes with disaggregated sector codes in the relevant column (i.e. cwColIndex)
   # where rows have an exact match for the disaggregated codes in the NAICS column
-  new_cw <-merge(new_cw, cw, by.x=c("NAICS"), by.y=c("NAICS_2012_Code"), all=T)
+  new_cw <-merge(new_cw, cw, by.x=c("NAICS"), by.y=c("NAICS_Code"), all=T)
 
   new_cw$USEEIO <- ifelse(is.na(new_cw$USEEIO_Code), new_cw$USEEIO, new_cw$USEEIO_Code)
 
@@ -1053,10 +1055,10 @@ disaggregateMasterCrosswalk <- function (model, disagg){
       rowComparisons[1:length(disagg$NewSectorCodes)] <- TRUE
     } else {
       #compare the value in the first column (NAICS) to the NAICS values in the disaggCrosswalk. Result is a string with TRUE where first column is a substring of values in disaggCrosswalk
-      rowComparisons <- grepl(crosswalkRow$NAICS[1], disagg$NAICSSectorCW$NAICS_2012_Code) 
+      rowComparisons <- grepl(crosswalkRow$NAICS[1], disagg$NAICSSectorCW$NAICS_Code) 
     }
 
-    rowReplacements <- disagg$NAICSSectorCW$NAICS_2012_Code[rowComparisons] #Get the NAICS sector codes in the disagg crosswalk that are a match for the NAICS substring in the master crosswalk 
+    rowReplacements <- disagg$NAICSSectorCW$NAICS_Code[rowComparisons] #Get the NAICS sector codes in the disagg crosswalk that are a match for the NAICS substring in the master crosswalk 
     rowReplacements <- sub("/.*","",disagg$NAICSSectorCW$USEEIO_Code[rowComparisons]) #Get the disaggregated sector codes that are mapped to the matches of the NAICS substring
     rowReplacements <- unique(rowReplacements) #reduce the list to the unique number of disaggregated sectors that the row comparisons map to
 

R/WIOFunctions.R

@@ -741,7 +741,7 @@ addSectorsToWIOCW <- function (model, spec){
   WIONAICSSectorCW[,1] <- "WIO"
   WIONAICSSectorCW$Tag <- "USEEIO sectors as WIO Treatment sectors"
   WIONAICSSectorCW$Type <- "N/A"
-  WIONAICSSectorCW$NAICS_2012_Code <- "N/A"
+  WIONAICSSectorCW$NAICS_Code <- "N/A"
   WIONAICSSectorCW$Subcategory <- "N/A"
   WIONAICSSectorCW$Description <- "N/A"
 

inst/extdata/disaggspecs/WasteDisaggregationDetail2017.yml

@@ -0,0 +1,8 @@
+Disaggregation:
+  562000/US:
+    OriginalSectorCode: "562000/US"
+    OriginalSectorName: "Waste Management and remediation services"
+    DisaggregationType: "Userdefined"
+    SectorFile: WasteDisaggregation_Sectors.csv
+    MakeFile: WasteDisaggregationDetail2017_Make.csv
+    UseFile: WasteDisaggregationDetail2017_Use.csv

inst/extdata/disaggspecs/WasteDisaggregationDetail2017_Make.csv

@@ -0,0 +1,77 @@
+IndustryCode,CommodityCode,PercentMake,Note
+562000/US,562111/US,4.79E-01,Make column sum
+562000/US,562HAZ/US,1.28E-01,Make column sum
+562000/US,562212/US,8.12E-02,Make column sum
+562000/US,562213/US,1.36E-02,Make column sum
+562000/US,562910/US,1.47E-01,Make column sum
+562000/US,562920/US,5.40E-02,Make column sum
+562000/US,562OTH/US,9.78E-02,Make column sum
+562111/US,562111/US,4.23E-01,Make table intersection
+562HAZ/US,562HAZ/US,1.50E-01,Make table intersection
+562212/US,562212/US,7.87E-02,Make table intersection
+562213/US,562213/US,1.31E-02,Make table intersection
+562910/US,562910/US,1.68E-01,Make table intersection
+562920/US,562920/US,5.23E-02,Make table intersection
+562OTH/US,562OTH/US,1.15E-01,Make table intersection
+221300/US,562111/US,7.63E-01,commodity disaggregation
+221300/US,562212/US,1.29E-01,commodity disaggregation
+221300/US,562213/US,2.16E-02,commodity disaggregation
+221300/US,562920/US,8.61E-02,commodity disaggregation
+484000/US,562111/US,1.00E+00,commodity disaggregation
+511110/US,562111/US,1.00E+00,commodity disaggregation
+561700/US,562910/US,1.00E+00,commodity disaggregation
+GSLGO/US,562111/US,7.63E-01,commodity disaggregation
+GSLGO/US,562212/US,1.29E-01,commodity disaggregation
+GSLGO/US,562213/US,2.16E-02,commodity disaggregation
+GSLGO/US,562920/US,8.61E-02,commodity disaggregation
+562212/US,211000/US,1.00E+00,industry disaggregation
+562111/US,2332D0/US,4.31E-01,industry disaggregation
+562HAZ/US,2332D0/US,1.94E-01,industry disaggregation
+562212/US,2332D0/US,8.19E-02,industry disaggregation
+562213/US,2332D0/US,1.36E-02,industry disaggregation
+562910/US,2332D0/US,1.51E-01,industry disaggregation
+562920/US,2332D0/US,4.06E-02,industry disaggregation
+562OTH/US,2332D0/US,8.85E-02,industry disaggregation
+562111/US,444000/US,4.31E-01,industry disaggregation
+562HAZ/US,444000/US,1.94E-01,industry disaggregation
+562212/US,444000/US,8.19E-02,industry disaggregation
+562213/US,444000/US,1.36E-02,industry disaggregation
+562910/US,444000/US,1.51E-01,industry disaggregation
+562920/US,444000/US,4.06E-02,industry disaggregation
+562OTH/US,444000/US,8.85E-02,industry disaggregation
+562111/US,48A000/US,4.31E-01,industry disaggregation
+562HAZ/US,48A000/US,1.94E-01,industry disaggregation
+562212/US,48A000/US,8.19E-02,industry disaggregation
+562213/US,48A000/US,1.36E-02,industry disaggregation
+562910/US,48A000/US,1.51E-01,industry disaggregation
+562920/US,48A000/US,4.06E-02,industry disaggregation
+562OTH/US,48A000/US,8.85E-02,industry disaggregation
+562111/US,532400/US,4.31E-01,industry disaggregation
+562HAZ/US,532400/US,1.94E-01,industry disaggregation
+562212/US,532400/US,8.19E-02,industry disaggregation
+562213/US,532400/US,1.36E-02,industry disaggregation
+562910/US,532400/US,1.51E-01,industry disaggregation
+562920/US,532400/US,4.06E-02,industry disaggregation
+562OTH/US,532400/US,8.85E-02,industry disaggregation
+562111/US,541511/US,4.31E-01,industry disaggregation
+562HAZ/US,541511/US,1.94E-01,industry disaggregation
+562212/US,541511/US,8.19E-02,industry disaggregation
+562213/US,541511/US,1.36E-02,industry disaggregation
+562910/US,541511/US,1.51E-01,industry disaggregation
+562920/US,541511/US,4.06E-02,industry disaggregation
+562OTH/US,541511/US,8.85E-02,industry disaggregation
+562111/US,5416A0/US,4.31E-01,industry disaggregation
+562HAZ/US,5416A0/US,1.94E-01,industry disaggregation
+562212/US,5416A0/US,8.19E-02,industry disaggregation
+562213/US,5416A0/US,1.36E-02,industry disaggregation
+562910/US,5416A0/US,1.51E-01,industry disaggregation
+562920/US,5416A0/US,4.06E-02,industry disaggregation
+562OTH/US,5416A0/US,8.85E-02,industry disaggregation
+562111/US,541700/US,4.31E-01,industry disaggregation
+562HAZ/US,541700/US,1.94E-01,industry disaggregation
+562212/US,541700/US,8.19E-02,industry disaggregation
+562213/US,541700/US,1.36E-02,industry disaggregation
+562910/US,541700/US,1.51E-01,industry disaggregation
+562920/US,541700/US,4.06E-02,industry disaggregation
+562OTH/US,541700/US,8.85E-02,industry disaggregation
+562920/US,S00401/US,1.00E+00,industry disaggregation