Skip to content

update GO, CPI, and Value added from annual update #7 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WesIngwersen merged 3 commits into from
Oct 14, 2025
Merged

update GO, CPI, and Value added from annual update #7 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4007dad
update GO, CPI, and Value added from annual update #7
bl-young Sep 26, 2025
1368a7b
make sure tests in summary model use a more recent IOYear
bl-young Sep 29, 2025
616d1b5
add vscodecounter to gitignore
WesIngwersen Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ inst/doc/**/*.html
renv/
examples
tests/*.xlsx
.VSCodeCounter/*
32 changes: 16 additions & 16 deletions R/DataDocumentation.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,43 +856,43 @@
#' @source \url{https://apps.bea.gov/industry/xls/io-annual/ImportMatrices_Before_Redefinitions_DET_2017.xlsx}
"Detail_Import_2012_BeforeRedef_17sch"

#' Detail 1997-2023 Gross Output (2017 schema)
#' @format A dataframe with 402 obs. and 27 variables
#' Detail 1997-2024 Gross Output (2017 schema)
#' @format A dataframe with 402 obs. and 28 variables
#' @source \url{https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip}
"Detail_GrossOutput_IO_17sch"

#' Summary 1997-2023 Gross Output (2017 schema)
#' @format A dataframe with 71 obs. and 27 variables
#' Summary 1997-2024 Gross Output (2017 schema)
#' @format A dataframe with 71 obs. and 28 variables
#' @source \url{https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip}
"Summary_GrossOutput_IO_17sch"

#' Sector 1997-2023 Gross Output (2017 schema)
#' @format A dataframe with 15 obs. and 27 variables
#' Sector 1997-2024 Gross Output (2017 schema)
#' @format A dataframe with 15 obs. and 28 variables
#' @source \url{https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip}
"Sector_GrossOutput_IO_17sch"

#' Detail 1997-2023 CPI (2017 schema)
#' @format A dataframe with 402 obs. and 27 variables
#' Detail 1997-2024 CPI (2017 schema)
#' @format A dataframe with 402 obs. and 28 variables
#' @source \url{https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip}
"Detail_CPI_IO_17sch"

#' Summary 1997-2023 CPI (2017 schema)
#' @format A dataframe with 71 obs. and 27 variables
#' Summary 1997-2024 CPI (2017 schema)
#' @format A dataframe with 71 obs. and 28 variables
#' @source \url{https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip}
"Summary_CPI_IO_17sch"

#' Sector 1997-2023 CPI (2017 schema)
#' @format A dataframe with 15 obs. and 27 variables
#' Sector 1997-2024 CPI (2017 schema)
#' @format A dataframe with 15 obs. and 28 variables
#' @source \url{https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip}
"Sector_CPI_IO_17sch"

#' Summary 1997-2023 Value Added (2017 schema)
#' @format A dataframe with 71 obs. and 27 variables
#' Summary 1997-2024 Value Added (2017 schema)
#' @format A dataframe with 71 obs. and 28 variables
#' @source \url{https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip}
"Summary_ValueAdded_IO_17sch"

#' Sector 1997-2023 Value Added (2017 schema)
#' @format A dataframe with 15 obs. and 27 variables
#' Sector 1997-2024 Value Added (2017 schema)
#' @format A dataframe with 15 obs. and 28 variables
#' @source \url{https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip}
"Sector_ValueAdded_IO_17sch"

Expand Down
Binary file modified data/Detail_CPI_IO_17sch.rda
View file
Open in desktop
Binary file not shown.
Binary file modified data/Detail_GrossOutput_IO_17sch.rda
View file
Open in desktop
Binary file not shown.
Binary file modified data/Sector_CPI_IO_17sch.rda
View file
Open in desktop
Binary file not shown.
Binary file modified data/Sector_GrossOutput_IO_17sch.rda
View file
Open in desktop
Binary file not shown.
Binary file modified data/Sector_ValueAdded_IO_17sch.rda
View file
Open in desktop
Binary file not shown.
Binary file modified data/Summary_CPI_IO_17sch.rda
View file
Open in desktop
Binary file not shown.
Binary file modified data/Summary_GrossOutput_IO_17sch.rda
View file
Open in desktop
Binary file not shown.
Binary file modified data/Summary_ValueAdded_IO_17sch.rda
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions inst/extdata/metadata/Detail_CPI_IO_17sch_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"tool": ["useeior"],
"name_data": ["Detail_CPI_IO_17sch"],
"tool_version": ["1.7.0"],
"tool_version": ["1.8.0"],
"ext": ["json"],
"date_created": ["2024-11-05"],
"date_created": ["2025-09-25"],
"data_meta": {
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"],
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023", "2024"],
"author": ["US Bureau of Economic Analysis"],
"source_url": ["https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip"],
"date_last_modified": ["2024-09-24"],
"date_accessed": ["2024-11-05"]
"date_last_modified": ["2025-09-23"],
"date_accessed": ["2025-09-26"]
}
}
10 changes: 5 additions & 5 deletions inst/extdata/metadata/Detail_GrossOutput_IO_17sch_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"tool": ["useeior"],
"name_data": ["Detail_GrossOutput_IO_17sch"],
"tool_version": ["1.7.0"],
"tool_version": ["1.8.0"],
"ext": ["json"],
"date_created": ["2024-11-05"],
"date_created": ["2025-09-25"],
"data_meta": {
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"],
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023", "2024"],
"author": ["US Bureau of Economic Analysis"],
"source_url": ["https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip"],
"date_last_modified": ["2024-09-24"],
"date_accessed": ["2024-11-05"]
"date_last_modified": ["2025-09-23"],
"date_accessed": ["2025-09-26"]
}
}
10 changes: 5 additions & 5 deletions inst/extdata/metadata/Sector_CPI_IO_17sch_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"tool": ["useeior"],
"name_data": ["Sector_CPI_IO_17sch"],
"tool_version": ["1.7.0"],
"tool_version": ["1.8.0"],
"ext": ["json"],
"date_created": ["2024-11-05"],
"date_created": ["2025-09-25"],
"data_meta": {
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"],
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023", "2024"],
"author": ["US Bureau of Economic Analysis"],
"source_url": ["https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip"],
"date_last_modified": ["2024-09-24"],
"date_accessed": ["2024-11-05"]
"date_last_modified": ["2025-09-23"],
"date_accessed": ["2025-09-26"]
}
}
10 changes: 5 additions & 5 deletions inst/extdata/metadata/Sector_GrossOutput_IO_17sch_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"tool": ["useeior"],
"name_data": ["Sector_GrossOutput_IO_17sch"],
"tool_version": ["1.7.0"],
"tool_version": ["1.8.0"],
"ext": ["json"],
"date_created": ["2024-11-05"],
"date_created": ["2025-09-25"],
"data_meta": {
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"],
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023", "2024"],
"author": ["US Bureau of Economic Analysis"],
"source_url": ["https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip"],
"date_last_modified": ["2024-09-24"],
"date_accessed": ["2024-11-05"]
"date_last_modified": ["2025-09-23"],
"date_accessed": ["2025-09-26"]
}
}
10 changes: 5 additions & 5 deletions inst/extdata/metadata/Sector_ValueAdded_IO_17sch_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"tool": ["useeior"],
"name_data": ["Sector_ValueAdded_IO_17sch"],
"tool_version": ["1.7.0"],
"tool_version": ["1.8.0"],
"ext": ["json"],
"date_created": ["2024-11-05"],
"date_created": ["2025-09-25"],
"data_meta": {
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"],
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023", "2024"],
"author": ["US Bureau of Economic Analysis"],
"source_url": ["https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip"],
"date_last_modified": ["2024-09-24"],
"date_accessed": ["2024-11-05"]
"date_last_modified": ["2025-09-23"],
"date_accessed": ["2025-09-26"]
}
}
10 changes: 5 additions & 5 deletions inst/extdata/metadata/Summary_CPI_IO_17sch_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"tool": ["useeior"],
"name_data": ["Summary_CPI_IO_17sch"],
"tool_version": ["1.7.0"],
"tool_version": ["1.8.0"],
"ext": ["json"],
"date_created": ["2024-11-05"],
"date_created": ["2025-09-25"],
"data_meta": {
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"],
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023", "2024"],
"author": ["US Bureau of Economic Analysis"],
"source_url": ["https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip"],
"date_last_modified": ["2024-09-24"],
"date_accessed": ["2024-11-05"]
"date_last_modified": ["2025-09-23"],
"date_accessed": ["2025-09-26"]
}
}
10 changes: 5 additions & 5 deletions inst/extdata/metadata/Summary_GrossOutput_IO_17sch_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"tool": ["useeior"],
"name_data": ["Summary_GrossOutput_IO_17sch"],
"tool_version": ["1.7.0"],
"tool_version": ["1.8.0"],
"ext": ["json"],
"date_created": ["2024-11-05"],
"date_created": ["2025-09-25"],
"data_meta": {
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"],
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023", "2024"],
"author": ["US Bureau of Economic Analysis"],
"source_url": ["https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip"],
"date_last_modified": ["2024-09-24"],
"date_accessed": ["2024-11-05"]
"date_last_modified": ["2025-09-23"],
"date_accessed": ["2025-09-26"]
}
}
10 changes: 5 additions & 5 deletions inst/extdata/metadata/Summary_ValueAdded_IO_17sch_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"tool": ["useeior"],
"name_data": ["Summary_ValueAdded_IO_17sch"],
"tool_version": ["1.7.0"],
"tool_version": ["1.8.0"],
"ext": ["json"],
"date_created": ["2024-11-05"],
"date_created": ["2025-09-25"],
"data_meta": {
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"],
"data_year": ["1997", "1998", "1999", "2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023", "2024"],
"author": ["US Bureau of Economic Analysis"],
"source_url": ["https://apps.bea.gov/industry/Release/ZIP/UGdpByInd.zip"],
"date_last_modified": ["2024-09-24"],
"date_accessed": ["2024-11-05"]
"date_last_modified": ["2025-09-23"],
"date_accessed": ["2025-09-26"]
}
}
6 changes: 3 additions & 3 deletions man/Detail_CPI_IO_17sch.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/Detail_GrossOutput_IO_17sch.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/Sector_CPI_IO_17sch.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/Sector_GrossOutput_IO_17sch.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/Sector_ValueAdded_IO_17sch.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/Summary_CPI_IO_17sch.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/Summary_GrossOutput_IO_17sch.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/Summary_ValueAdded_IO_17sch.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion tests/test_model_build.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ cfg <- paste0("modelspecs/", m, ".yml")
model <- buildModel(m, configpaths = file.path(cfg))
printValidationResults(model)

## USEEIOv2.2-s-GHG Summary, commodity model (2017 Schema)
## USEEIOv2.2-s-GHG Summary (2022), commodity model (2017 Schema)
model <- useeior:::initializeModel(m, configpaths = file.path(cfg))
model$specs$Model <- "USEEIOv2.2-s-GHG"
model$specs$BaseIOLevel <- "Summary"
model$specs$IOYear <- 2022
model$crosswalk <- useeior:::getModelCrosswalk(model) # reassign for summary model
model <- useeior:::loadIOData(model)
model <- useeior:::loadandbuildSatelliteTables(model)
Expand Down