Merge branch 'develop' into 2017MakeUse

R/ConfigurationFunctions.R

@@ -24,6 +24,10 @@ getConfiguration <- function(configname, configtype, configpaths = NULL, pkg="us
     }
   }
   config <- configr::read.config(configpath)
+  if (typeof(config) == "logical" && config == FALSE) {
+    logging::logwarn(paste0("Configuration not found for ", configname))
+    return(NULL)
+  }
   return(config)
 }
 

R/InitializeModel.R

@@ -9,7 +9,7 @@ initializeModel <- function(modelname, configpaths = NULL) {
   model <- list()
   # Get model specs
   model$specs <- getConfiguration(modelname, "model", configpaths)
-  if (rlang::is_na(model$specs)) {
+  if (is.null(model$specs)) {
     stop(paste("No configuration exists for a model named", modelname))
   } else {
     # Get model crosswalk

R/LCIAfmtFunctions.R

@@ -49,6 +49,9 @@ getImpactMethod <- function(ind_spec) {
   # Subset the method by indicator
   if(!is.null(indicators)){
     imp_method <- imp_method[imp_method$Indicator %in% indicators, ]
+    if(nrow(imp_method)==0) {
+      logging::logwarn("Error selecting indicators from method")
+    }
   }
 
   return(imp_method)

R/LoadSatellites.R

@@ -114,10 +114,20 @@ generateTbSfromSatSpec <- function(sat_spec, model) {
       }
     }
     totals_by_sector <- do.call(eval(totalsgenfunction), list(params))
-  } else {
+  } else if (sat_spec$FileLocation == "DataCommons") {
     f <- loadDataCommonsfile(sat_spec$StaticFile)
     totals_by_sector <- utils::read.table(f, sep = ",", header = TRUE, stringsAsFactors = FALSE,
                                           fileEncoding = 'UTF-8-BOM')
+  } else {
+    totals_by_sector <- utils::read.table(sat_spec$StaticFile, sep = ",",
+                                          header = TRUE, stringsAsFactors = FALSE,
+                                          fileEncoding = 'UTF-8-BOM')    
+  }
+  # Ensure context is not NA
+  for (i in c('Context')) {
+    if (all(is.na(totals_by_sector[, i]))) {
+      totals_by_sector[ , i] <- ""
+    }
   }
   return(totals_by_sector)
 }