drop N dqi for import factors as not relevant yet

Author: bl-young

R/DataQualityFunctions.R

@@ -192,6 +192,10 @@ createNdqi <- function(model) {
   if(is.null(D_dqi) || (ncol(model$D) != ncol(D_dqi))) {
     return(NULL)
   }
+  if(model$specs$ExternalImportFactors) {
+    logging::logwarn("Some model DQI can not be calculated for models with External Import Factors .")
+    return(NULL)
+  }
   N_dqi <- ((model$D * D_dqi[,,1]) %*% model$L) / model$N # Temporary for initialization
   dqi_3d <- initializeArray(N_dqi, dim(D_dqi)[3], dimnames(D_dqi)[[3]])
   for (i in 1:dim(D_dqi)[3]) {

tests/test_model_build.R

@@ -124,7 +124,7 @@ printValidationResults(model)
 m <- "USEEIOv2.3-GHG"
 model <- buildModel(m)
 printValidationResults(model)
-writeModeltoXLSX(model, ".")
+writeModeltoXLSX(model, ".", dqi=TRUE)
 
 ## USEEIOv2.3 Summary, commodity model with GHGs and Import Factors
 m <- "USEEIOv2.3-s-GHG-19"