Merge pull request #325 from USEPA/release_v1.6.1

Release v1.6.1
USEPA · Nov 4, 2024 · 71489bb · 71489bb
2 parents 6d5209a + 13854b4
commit 71489bb
Show file tree

Hide file tree

Showing 72 changed files with 2,076 additions and 454 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -39,7 +39,6 @@ jobs:
         config:
           # - {os: macOS-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
-          #- {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
           - {os: ubuntu-latest,   r: 'oldrel-1'}
 

diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ work
 inst/doc/**/*.html
 renv/
 examples
+tests/*.xlsx
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,12 +1,11 @@
 Package: useeior
 Type: Package
 Title: USEEIO R modeling software
-Version: 1.5.3
-Date: 2024-7-13
+Version: 1.6.1
+Date: 2024-11-4
 Authors@R: c(
   person("Ben","Young", email="[email protected]", role="aut"),
   person("Jorge","Vendries", email="[email protected]", role="aut"),
-  person("Mo","Li", email="[email protected]", role="aut"),
   person("Wesley","Ingwersen", email="[email protected]", role= c("aut", "cre")))
 Description: The United States Environmentally-Extended Input-Output model
   is a model used to estimate potential environmental and economic impacts
@@ -41,7 +40,7 @@ License: file LICENSE
 Encoding: UTF-8
 LazyData: true
 LazyDataCompression: xz
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Suggests: 
     testthat (>= 3.0.0)
 Config/testthat/edition: 3
diff --git a/NAMESPACE b/NAMESPACE
@@ -2,22 +2,16 @@
 
 export(adjustResultMatrixPrice)
 export(aggregateResultMatrix)
-export(aggregateResultMatrixbyRow)
 export(barplotFloworImpactFractionbyRegion)
 export(barplotIndicatorScoresbySector)
+export(buildIOModel)
 export(buildModel)
 export(buildTwoRegionModels)
 export(calculateEEIOModel)
 export(calculateFlowContributiontoImpact)
 export(calculateMarginSectorImpacts)
-export(calculateSectorContributiontoImpact)
 export(calculateSectorPurchasedbySectorSourcedImpact)
-export(compare2RCommodityTotals)
-export(compareCommodityOutputXMarketShareandIndustryOutputwithCPITransformation)
-export(compareCommodityOutputandDomesticUseplusProductionDemand)
-export(compareEandLCIResult)
 export(compareFlowTotals)
-export(compareOutputandLeontiefXDemand)
 export(disaggregateTotalToDirectAndTier1)
 export(extractAndFormatDemandVector)
 export(formatDemandVector)
@@ -26,10 +20,10 @@ export(heatmapSatelliteTableCoverage)
 export(heatmapSectorRanking)
 export(normalizeResultMatrixByTotalImpacts)
 export(plotMatrixCoefficient)
-export(print2RValidationResults)
 export(printValidationResults)
 export(seeAvailableModels)
-export(validate2RCommodityTotals)
+export(testCalculationFunctions)
+export(testVisualizationFunctions)
 export(writeModelMatrices)
 export(writeModelforAPI)
 export(writeModeltoXLSX)

diff --git a/R/AdjustPrice.R b/R/AdjustPrice.R
@@ -19,8 +19,12 @@ adjustResultMatrixPrice <- function(matrix_name, currency_year, purchaser_price=
   }
   # Adjust price type of multiplier
   if (purchaser_price) {
-    logging::loginfo(paste("Adjusting", matrix_name, "matrix from producer to purchaser price..."))
-    mat <- adjustMultiplierPriceType(mat, currency_year, model)
+    if(is.null(model$Phi)) {
+      logging::logwarn("Model does not contain margins, purchaser price can not be calculated")
+    } else {
+      logging::loginfo(paste("Adjusting", matrix_name, "matrix from producer to purchaser price..."))
+      mat <- adjustMultiplierPriceType(mat, currency_year, model)
+    }
   } else {
     logging::loginfo(paste("Keeping", matrix_name, "matrix in producer price..."))
   }