update tests for waste disaggregation

Author: bl-young

tests/test_model_build.R

@@ -48,31 +48,32 @@ model <- useeior:::loadDemandVectors(model)
 model <- useeior:::constructEEIOMatrices(model)
 printValidationResults(model)
 
-
-### NEW - Need to an an alias as per https://github.com/USEPA/USEEIO/blob/master/versioning/aliases.csv
-## USEEIOv2.4.1-408-GHG Detail, commodity model (2017 Schema) with disaggregation
-m <- "USEEIOv2.4.1-408-GHG"
+## USEEIOv2.2-GHG Detail, commodity model (2017 Schema) with disaggregation
+m <- "USEEIOv2.2-GHG"
 cfg <- c(paste0("modelspecs/", m, ".yml"),
          "disaggspecs/WasteDisaggregationDetail2017.yml",
          "disaggspecs/WasteDisaggregationDetail2017_Make.csv",
-         "disaggspecs/WasteDisaggregationDetail2017_Use.csv",
-         "disaggspecs/WasteDisaggregationDetail2017_Env.csv",
-         "disaggspecs/WasteDisaggregationDetail2017_Sectors.csv"
-)
-model <- buildModel(m, configpaths = file.path(cfg))
+         "disaggspecs/WasteDisaggregationDetail2017_Use.csv"
+        )
+model <- useeior:::initializeModel(m, configpaths = file.path(cfg))
+model$specs$Model <- "USEEIOv2.2-GHG-408"
+model$specs$DisaggregationSpecs <- "WasteDisaggregationDetail2017"
+model <- useeior:::loadIOData(model, configpaths = cfg)
+model <- useeior:::loadandbuildSatelliteTables(model)
+model <- useeior:::loadandbuildIndicators(model)
+model <- useeior:::loadDemandVectors(model)
+model <- useeior:::constructEEIOMatrices(model, configpaths = cfg)
 printValidationResults(model)
 
-## USEEIOv2.4-s-GHG Summary, commodity model (2017 Schema)
-m <- "USEEIOv2.4.1-408-GHG"
+## USEEIOv2.2-s-GHG Summary, commodity model (2017 Schema) with disaggregation
+m <- "USEEIOv2.2-GHG"
 cfg <- c(paste0("modelspecs/", m, ".yml"),
          "disaggspecs/WasteDisaggregationSummary2017.yml",
          "disaggspecs/WasteDisaggregationSummary2017_Make.csv",
-         "disaggspecs/WasteDisaggregationSummary2017_Use.csv",
-         "disaggspecs/WasteDisaggregationSummary2017_Sectors.csv"
-)
-
+         "disaggspecs/WasteDisaggregationSummary2017_Use.csv"
+        )
 model <- useeior:::initializeModel(m, configpaths = file.path(cfg))
-model$specs$Model <- "USEEIOv2.4.1-s-GHG"
+model$specs$Model <- "USEEIOv2.2-s-GHG-79"
 model$specs$BaseIOLevel <- "Summary"
 model$crosswalk <- useeior:::getModelCrosswalk(model) # reassign for summary model
 model$specs$DisaggregationSpecs <- "WasteDisaggregationSummary2017"
@@ -84,9 +85,6 @@ model <- useeior:::constructEEIOMatrices(model, configpaths = cfg)
 printValidationResults(model)
 
 
-
-###
-
 ## USEEIOv2 - integrated hybrid
 m <- "USEEIOv2.0-GHG-NGCombustion"
 cfg <- c(paste0("modelspecs/", m, ".yml"),