Skip to content

Commit

Permalink
Merge pull request #108 from USEPA/issue105_kmn
Browse files Browse the repository at this point in the history 
Fixed issue with compile action
  • Loading branch information
@knoiva-indecon
knoiva-indecon authored Nov 26, 2024
2 parents fa8c711 + 3a9227e commit 6a182fb
Show file tree
Hide file tree
Showing 8 changed files with 209,283 additions and 209,385 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/compile_main_fredi_data.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ jobs:
- name: Install FrEDI
run: |
Rscript -e '
devtools::install_github(
repo = "https://github.com/USEPA/FrEDI",
ref = "${{ github.event.inputs.branch_name }}",
# subdir = "FrEDI",
devtools::install_github(
repo = "https://github.com/USEPA/FrEDI",
ref = "${{ github.event.inputs.branch_name }}",
# subdir = "FrEDI",
dependencies = FALSE,
upgrade = "never",
upgrade = "never",
force = TRUE,
type = "source"
type = "source"
)'
- name: Run createsystemData
run: |
Rscript -e '
Expand All @@ -74,7 +74,7 @@ jobs:
path: |
./data_tests/*
./data/tmp_sysdata.rd*
- name: Commit results
run: |
Expand Down
Binary file added data/tmp_sysdata.rda
View file
Binary file not shown.
Binary file modified data_tests/generalConfig_testResults.xlsx
View file
Binary file not shown.
102 changes: 0 additions & 102 deletions inst/extdata/fredi/scalars/Scalar_econScalar_econAdjust.csv
View file

This file was deleted.

204 changes: 102 additions & 102 deletions inst/extdata/fredi/scalars/Scalar_econScalar_unitCost_carbon.csv
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,102 @@
"state","postal","year","value","scalarName"
"National Total",NA,2000,NA,"unitCost_carbon"
"National Total",NA,2001,NA,"unitCost_carbon"
"National Total",NA,2002,NA,"unitCost_carbon"
"National Total",NA,2003,NA,"unitCost_carbon"
"National Total",NA,2004,NA,"unitCost_carbon"
"National Total",NA,2005,NA,"unitCost_carbon"
"National Total",NA,2006,NA,"unitCost_carbon"
"National Total",NA,2007,NA,"unitCost_carbon"
"National Total",NA,2008,NA,"unitCost_carbon"
"National Total",NA,2009,NA,"unitCost_carbon"
"National Total",NA,2010,NA,"unitCost_carbon"
"National Total",NA,2011,NA,"unitCost_carbon"
"National Total",NA,2012,NA,"unitCost_carbon"
"National Total",NA,2013,NA,"unitCost_carbon"
"National Total",NA,2014,NA,"unitCost_carbon"
"National Total",NA,2015,NA,"unitCost_carbon"
"National Total",NA,2016,NA,"unitCost_carbon"
"National Total",NA,2017,NA,"unitCost_carbon"
"National Total",NA,2018,NA,"unitCost_carbon"
"National Total",NA,2019,NA,"unitCost_carbon"
"National Total",NA,2020,47.096877027,"unitCost_carbon"
"National Total",NA,2021,48.020345204,"unitCost_carbon"
"National Total",NA,2022,48.943813381,"unitCost_carbon"
"National Total",NA,2023,49.867281558,"unitCost_carbon"
"National Total",NA,2024,50.790749735,"unitCost_carbon"
"National Total",NA,2025,51.714217912,"unitCost_carbon"
"National Total",NA,2026,52.8223797244,"unitCost_carbon"
"National Total",NA,2027,53.9305415368,"unitCost_carbon"
"National Total",NA,2028,55.0387033492,"unitCost_carbon"
"National Total",NA,2029,56.1468651616,"unitCost_carbon"
"National Total",NA,2030,57.255026974,"unitCost_carbon"
"National Total",NA,2031,58.178495151,"unitCost_carbon"
"National Total",NA,2032,59.101963328,"unitCost_carbon"
"National Total",NA,2033,60.025431505,"unitCost_carbon"
"National Total",NA,2034,60.948899682,"unitCost_carbon"
"National Total",NA,2035,61.872367859,"unitCost_carbon"
"National Total",NA,2036,62.9805296714,"unitCost_carbon"
"National Total",NA,2037,64.0886914838,"unitCost_carbon"
"National Total",NA,2038,65.1968532962,"unitCost_carbon"
"National Total",NA,2039,66.3050151086,"unitCost_carbon"
"National Total",NA,2040,67.413176921,"unitCost_carbon"
"National Total",NA,2041,68.5213387334,"unitCost_carbon"
"National Total",NA,2042,69.6295005458,"unitCost_carbon"
"National Total",NA,2043,70.7376623582,"unitCost_carbon"
"National Total",NA,2044,71.8458241706,"unitCost_carbon"
"National Total",NA,2045,72.953985983,"unitCost_carbon"
"National Total",NA,2046,74.0621477954,"unitCost_carbon"
"National Total",NA,2047,75.1703096078,"unitCost_carbon"
"National Total",NA,2048,76.2784714202,"unitCost_carbon"
"National Total",NA,2049,77.3866332326,"unitCost_carbon"
"National Total",NA,2050,78.494795045,"unitCost_carbon"
"National Total",NA,2051,78.494795045,"unitCost_carbon"
"National Total",NA,2052,78.494795045,"unitCost_carbon"
"National Total",NA,2053,78.494795045,"unitCost_carbon"
"National Total",NA,2054,78.494795045,"unitCost_carbon"
"National Total",NA,2055,78.494795045,"unitCost_carbon"
"National Total",NA,2056,78.494795045,"unitCost_carbon"
"National Total",NA,2057,78.494795045,"unitCost_carbon"
"National Total",NA,2058,78.494795045,"unitCost_carbon"
"National Total",NA,2059,78.494795045,"unitCost_carbon"
"National Total",NA,2060,78.494795045,"unitCost_carbon"
"National Total",NA,2061,78.494795045,"unitCost_carbon"
"National Total",NA,2062,78.494795045,"unitCost_carbon"
"National Total",NA,2063,78.494795045,"unitCost_carbon"
"National Total",NA,2064,78.494795045,"unitCost_carbon"
"National Total",NA,2065,78.494795045,"unitCost_carbon"
"National Total",NA,2066,78.494795045,"unitCost_carbon"
"National Total",NA,2067,78.494795045,"unitCost_carbon"
"National Total",NA,2068,78.494795045,"unitCost_carbon"
"National Total",NA,2069,78.494795045,"unitCost_carbon"
"National Total",NA,2070,78.494795045,"unitCost_carbon"
"National Total",NA,2071,78.494795045,"unitCost_carbon"
"National Total",NA,2072,78.494795045,"unitCost_carbon"
"National Total",NA,2073,78.494795045,"unitCost_carbon"
"National Total",NA,2074,78.494795045,"unitCost_carbon"
"National Total",NA,2075,78.494795045,"unitCost_carbon"
"National Total",NA,2076,78.494795045,"unitCost_carbon"
"National Total",NA,2077,78.494795045,"unitCost_carbon"
"National Total",NA,2078,78.494795045,"unitCost_carbon"
"National Total",NA,2079,78.494795045,"unitCost_carbon"
"National Total",NA,2080,78.494795045,"unitCost_carbon"
"National Total",NA,2081,78.494795045,"unitCost_carbon"
"National Total",NA,2082,78.494795045,"unitCost_carbon"
"National Total",NA,2083,78.494795045,"unitCost_carbon"
"National Total",NA,2084,78.494795045,"unitCost_carbon"
"National Total",NA,2085,78.494795045,"unitCost_carbon"
"National Total",NA,2086,78.494795045,"unitCost_carbon"
"National Total",NA,2087,78.494795045,"unitCost_carbon"
"National Total",NA,2088,78.494795045,"unitCost_carbon"
"National Total",NA,2089,78.494795045,"unitCost_carbon"
"National Total",NA,2090,78.494795045,"unitCost_carbon"
"National Total",NA,2091,78.494795045,"unitCost_carbon"
"National Total",NA,2092,78.494795045,"unitCost_carbon"
"National Total",NA,2093,78.494795045,"unitCost_carbon"
"National Total",NA,2094,78.494795045,"unitCost_carbon"
"National Total",NA,2095,78.494795045,"unitCost_carbon"
"National Total",NA,2096,78.494795045,"unitCost_carbon"
"National Total",NA,2097,78.494795045,"unitCost_carbon"
"National Total",NA,2098,78.494795045,"unitCost_carbon"
"National Total",NA,2099,78.494795045,"unitCost_carbon"
"National Total",NA,2100,78.494795045,"unitCost_carbon"
state,postal,year,value,scalarName
NA,NA,2000,NA,unitCost_carbon
NA,NA,2001,NA,unitCost_carbon
NA,NA,2002,NA,unitCost_carbon
NA,NA,2003,NA,unitCost_carbon
NA,NA,2004,NA,unitCost_carbon
NA,NA,2005,NA,unitCost_carbon
NA,NA,2006,NA,unitCost_carbon
NA,NA,2007,NA,unitCost_carbon
NA,NA,2008,NA,unitCost_carbon
NA,NA,2009,NA,unitCost_carbon
NA,NA,2010,NA,unitCost_carbon
NA,NA,2011,NA,unitCost_carbon
NA,NA,2012,NA,unitCost_carbon
NA,NA,2013,NA,unitCost_carbon
NA,NA,2014,NA,unitCost_carbon
NA,NA,2015,NA,unitCost_carbon
NA,NA,2016,NA,unitCost_carbon
NA,NA,2017,NA,unitCost_carbon
NA,NA,2018,NA,unitCost_carbon
NA,NA,2019,NA,unitCost_carbon
NA,NA,2020,47.09687703,unitCost_carbon
NA,NA,2021,48.0203452,unitCost_carbon
NA,NA,2022,48.94381338,unitCost_carbon
NA,NA,2023,49.86728156,unitCost_carbon
NA,NA,2024,50.79074974,unitCost_carbon
NA,NA,2025,51.71421791,unitCost_carbon
NA,NA,2026,52.82237972,unitCost_carbon
NA,NA,2027,53.93054154,unitCost_carbon
NA,NA,2028,55.03870335,unitCost_carbon
NA,NA,2029,56.14686516,unitCost_carbon
NA,NA,2030,57.25502697,unitCost_carbon
NA,NA,2031,58.17849515,unitCost_carbon
NA,NA,2032,59.10196333,unitCost_carbon
NA,NA,2033,60.02543151,unitCost_carbon
NA,NA,2034,60.94889968,unitCost_carbon
NA,NA,2035,61.87236786,unitCost_carbon
NA,NA,2036,62.98052967,unitCost_carbon
NA,NA,2037,64.08869148,unitCost_carbon
NA,NA,2038,65.1968533,unitCost_carbon
NA,NA,2039,66.30501511,unitCost_carbon
NA,NA,2040,67.41317692,unitCost_carbon
NA,NA,2041,68.52133873,unitCost_carbon
NA,NA,2042,69.62950055,unitCost_carbon
NA,NA,2043,70.73766236,unitCost_carbon
NA,NA,2044,71.84582417,unitCost_carbon
NA,NA,2045,72.95398598,unitCost_carbon
NA,NA,2046,74.0621478,unitCost_carbon
NA,NA,2047,75.17030961,unitCost_carbon
NA,NA,2048,76.27847142,unitCost_carbon
NA,NA,2049,77.38663323,unitCost_carbon
NA,NA,2050,78.49479505,unitCost_carbon
NA,NA,2051,78.49479505,unitCost_carbon
NA,NA,2052,78.49479505,unitCost_carbon
NA,NA,2053,78.49479505,unitCost_carbon
NA,NA,2054,78.49479505,unitCost_carbon
NA,NA,2055,78.49479505,unitCost_carbon
NA,NA,2056,78.49479505,unitCost_carbon
NA,NA,2057,78.49479505,unitCost_carbon
NA,NA,2058,78.49479505,unitCost_carbon
NA,NA,2059,78.49479505,unitCost_carbon
NA,NA,2060,78.49479505,unitCost_carbon
NA,NA,2061,78.49479505,unitCost_carbon
NA,NA,2062,78.49479505,unitCost_carbon
NA,NA,2063,78.49479505,unitCost_carbon
NA,NA,2064,78.49479505,unitCost_carbon
NA,NA,2065,78.49479505,unitCost_carbon
NA,NA,2066,78.49479505,unitCost_carbon
NA,NA,2067,78.49479505,unitCost_carbon
NA,NA,2068,78.49479505,unitCost_carbon
NA,NA,2069,78.49479505,unitCost_carbon
NA,NA,2070,78.49479505,unitCost_carbon
NA,NA,2071,78.49479505,unitCost_carbon
NA,NA,2072,78.49479505,unitCost_carbon
NA,NA,2073,78.49479505,unitCost_carbon
NA,NA,2074,78.49479505,unitCost_carbon
NA,NA,2075,78.49479505,unitCost_carbon
NA,NA,2076,78.49479505,unitCost_carbon
NA,NA,2077,78.49479505,unitCost_carbon
NA,NA,2078,78.49479505,unitCost_carbon
NA,NA,2079,78.49479505,unitCost_carbon
NA,NA,2080,78.49479505,unitCost_carbon
NA,NA,2081,78.49479505,unitCost_carbon
NA,NA,2082,78.49479505,unitCost_carbon
NA,NA,2083,78.49479505,unitCost_carbon
NA,NA,2084,78.49479505,unitCost_carbon
NA,NA,2085,78.49479505,unitCost_carbon
NA,NA,2086,78.49479505,unitCost_carbon
NA,NA,2087,78.49479505,unitCost_carbon
NA,NA,2088,78.49479505,unitCost_carbon
NA,NA,2089,78.49479505,unitCost_carbon
NA,NA,2090,78.49479505,unitCost_carbon
NA,NA,2091,78.49479505,unitCost_carbon
NA,NA,2092,78.49479505,unitCost_carbon
NA,NA,2093,78.49479505,unitCost_carbon
NA,NA,2094,78.49479505,unitCost_carbon
NA,NA,2095,78.49479505,unitCost_carbon
NA,NA,2096,78.49479505,unitCost_carbon
NA,NA,2097,78.49479505,unitCost_carbon
NA,NA,2098,78.49479505,unitCost_carbon
NA,NA,2099,78.49479505,unitCost_carbon
NA,NA,2100,78.49479505,unitCost_carbon
Loading

0 comments on commit 6a182fb

Please sign in to comment.