maintain compatability w/ 2012 models

Author: bl-young

R/LoadMargins.R

@@ -17,7 +17,9 @@ getMarginsTable <- function (model) {
   # Change in inventory has negative margins for positive change, which does not accurately portray actual margins either.
   purchaser_removal <- sapply(list("Export", "Import", "ChangeInventories"), getVectorOfCodes,
                               ioschema = model$specs$BaseIOSchema, iolevel = "Detail")
-  MarginsTable <- MarginsTable[!MarginsTable$IndustryCode%in%purchaser_removal,]
+  # column names from Margins Tables from 2012 schema were not fixed
+  col <- ifelse("NIPACode" %in% names(MarginsTable), "NIPACode", "IndustryCode")
+  MarginsTable <- MarginsTable[!MarginsTable[[col]] %in% purchaser_removal,]
   # Remove Scrap, Used and secondhand goods, and Non-comparable imports, and Rest of world adjustment commodities
   commodity_removal <- sapply(list("Scrap", "UsedGoods", "NonComparableImport", "RoWAdjustment"), getVectorOfCodes,
                               ioschema = model$specs$BaseIOSchema, iolevel = model$specs$BaseIOLevel)