cleanup and update documentation

R/IOFunctions.R

@@ -174,19 +174,6 @@ calculateLeontiefInverse <- function(A) {
 #' @param model, An EEIO model object with model specs and crosswalk table loaded
 #' @return A Domestic Use table with rows as commodity codes and columns as industry and final demand codes
 generateDomesticUse <- function(Use, model) {
-  # Load Import matrix
-
-  # if (model$specs$BaseIOLevel != "Sector") {
-  #   Import <- get(paste(model$specs$BaseIOLevel, "Import",
-  #                       model$specs$IOYear, "BeforeRedef", sep = "_"))*1E6
-  # } else {
-  #   # Load Summary level Import matrix
-  #   Import <- get(paste("Summary_Import", model$specs$IOYear, "BeforeRedef", sep = "_"))*1E6
-  #   # Aggregate Import from Summary to Sector
-  #   Import <- as.data.frame(aggregateMatrix(as.matrix(Import), "Summary", "Sector", model))
-  # }
-  # Import <- Import[rownames(Use), colnames(Use)]
-
   Import <- model$ImportMatrix
   # Adjust Import matrix to BAS price if model is in BAS price
   # Note: according to the documentation in BEA Import matrix, import values in
@@ -231,17 +218,6 @@ generateDomesticUse <- function(Use, model) {
 #' @param model, An EEIO model object with model specs and crosswalk table loaded
 #' @return An international trade adjustment vector with names as commodity codes
 generateInternationalTradeAdjustmentVector <- function(Use, model) {
-  # Load Import matrix
-
-  # if (model$specs$BaseIOLevel!="Sector") {
-  #   Import <- get(paste(model$specs$BaseIOLevel, "Import", model$specs$IOYear, "BeforeRedef", sep = "_"))*1E6
-  # } else {
-  #   # Load Summary level Import matrix
-  #   Import <- get(paste("Summary_Import", model$specs$IOYear, "BeforeRedef", sep = "_"))*1E6
-  #   # Aggregate Import from Summary to Sector
-  #   Import <- as.data.frame(aggregateMatrix(as.matrix(Import), "Summary", "Sector", model))
-  # }
-
   Import <- model$ImportMatrix
   # Define Import code
   ImportCode <- getVectorOfCodes(model$specs$BaseIOSchema, model$specs$BaseIOLevel, "Import")

R/LoadExternalImportFactors.R

@@ -1,11 +1,9 @@
 # Functions for loading external import factors
 
-#' Prepare economic components of an EEIO form USEEIO model.
+#' Load and prepare import coefficients
 #' @param model An EEIO form USEEIO model object with model specs loaded
-#' @param configpaths str vector, paths (including file name) of model configuration file
-#' If NULL, built-in config files are used.
-#' @return A list with EEIO form USEEIO model economic components.
-loadExternalImportFactors <- function(model, configpaths = NULL) {
+#' @return M_m, matrix of import coefficients (flow x sector).
+loadExternalImportFactors <- function(model) {
 
   # Read in file with Import factors
   IFSpec <- model$specs$ImportFactors[[1]]

R/LoadIOTables.R

@@ -186,7 +186,6 @@ loadNationalIOData <- function(model, io_codes) {
   io_codes$FinalDemandCodes <- colnames(BEA$FinalDemand)
 
   BEA$ImportMatrix <- loadImportMatrix(model, io_codes)
-  model$ImportMatrix <- BEA$ImportMatrix
 
   # Generate domestic Use transaction and final demand
   DomesticUse <- generateDomesticUse(cbind(BEA$UseTransactions, BEA$FinalDemand), model)
@@ -295,7 +294,7 @@ loadBEAtables <- function(specs, io_codes) {
 #' Load, format, and save import matrix as a USEEIO model object.
 #' @param model A model object with model specs loaded.
 #' @param io_codes A list of BEA IO codes.
-#' @return A USEEIO model with import matrix object.
+#' @return Import, a use table import matrix.
 loadImportMatrix <- function(model, io_codes) {
   # Load Import matrix
   if (model$specs$BaseIOLevel != "Sector") {