diff --git a/R/CalculationFunctions.R b/R/CalculationFunctions.R index bff444ab..5ed21e74 100644 --- a/R/CalculationFunctions.R +++ b/R/CalculationFunctions.R @@ -128,6 +128,7 @@ calculateResultsWithExternalFactors <- function(model, perspective = "FINAL", de hh = t(as.matrix(model$B_h[, codes])) * colSums(as.matrix(model$U[, codes])) hh_lcia = t(model$C %*% as.matrix(model$B_h[, codes])) * colSums(as.matrix(model$U[, codes])) rownames(hh) <- codes + rownames(hh_lcia) <- codes # Calculate Final perspective results if(perspective == "FINAL"){ diff --git a/R/VisualizationFunctions.R b/R/VisualizationFunctions.R index 3d0a29a0..7a2df283 100644 --- a/R/VisualizationFunctions.R +++ b/R/VisualizationFunctions.R @@ -339,8 +339,8 @@ getBEASectorColorMapping <- function(model) { ColorLabelMapping$color <- rownames(ColorLabelMapping) # Add Households, Used and Other # ColorLabelMapping["#FFE119", ] <- c("Households", "F010", "#FFE119") # yellow - # ColorLabelMapping["#42D4F4", ] <- c("Used", "Used", "#42D4F4") # cyan (bright blue) - # ColorLabelMapping["#469990", ] <- c("Other", "Other", "#469990") # teal + ColorLabelMapping["#42D4F4", ] <- c("Used", "Used", "#42D4F4") # cyan (bright blue) + ColorLabelMapping["#469990", ] <- c("Other", "Other", "#469990") # teal # Prepare BEA Sector-modelIOLevel mapping mapping <- unique(model$crosswalk[, c("BEA_Sector", "USEEIO")]) colnames(mapping) <- c("Sector", paste0(model$specs$BaseIOLevel, "Code"))