Skip to content

Commit

Permalink
merge from main to dev with updated test data (#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
@brtietz
brtietz authored Feb 27, 2024
1 parent e463029 commit 0193a69
Show file tree
Hide file tree
Showing 332 changed files with 7,085 additions and 7,085 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: ATB-calc Python tests

on:
push:
branches: [ "main" ]
branches: [ "main", "dev" ]
pull_request:
branches: [ "main" ]
branches: [ "main", "dev" ]

permissions:
contents: read
Expand Down
6 changes: 3 additions & 3 deletions tests/data/Biopower/Market/20/df_capex.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
Biopower - Dedicated/Advanced,5424.441677149275,5237.291295244163,5050.140913339052,4901.220419961243,4810.0553783630885,4761.776754925768,4730.422069073105,4701.375696474861,4673.184564593504,4636.955088385996,4603.443608753774,4575.354505579287,4545.9718173573,4517.431492125601,4484.738283121041,4452.3289712132055,4422.666655745553,4387.966733663533,4357.852105086763,4330.891584550169,4299.043736403634,4270.902934361364,4240.461053520893,4208.041510329079,4176.280157492965,4146.1762020121905,4114.178396540979,4080.3715123407014,4029.554177014421
Biopower - Dedicated/Moderate,5424.441677149275,5237.291295244163,5050.140913339052,4901.220419961243,4810.0553783630885,4761.776754925768,4730.422069073105,4701.375696474861,4673.184564593504,4636.955088385996,4603.443608753774,4575.354505579287,4545.9718173573,4517.431492125601,4484.738283121041,4452.3289712132055,4422.666655745553,4387.966733663533,4357.852105086763,4330.891584550169,4299.043736403634,4270.902934361364,4240.461053520893,4208.041510329079,4176.280157492965,4146.1762020121905,4114.178396540979,4080.3715123407014,4029.554177014421
Biopower - Dedicated/Conservative,5424.441677149275,5237.291295244163,5050.140913339052,4901.220419961243,4810.0553783630885,4761.776754925768,4730.422069073105,4701.375696474861,4673.184564593504,4636.955088385996,4603.443608753774,4575.354505579287,4545.9718173573,4517.431492125601,4484.738283121041,4452.3289712132055,4422.666655745553,4387.966733663533,4357.852105086763,4330.891584550169,4299.043736403634,4270.902934361364,4240.461053520893,4208.041510329079,4176.280157492965,4146.1762020121905,4114.178396540979,4080.3715123407014,4029.554177014421
Biopower - Dedicated/Advanced,5536.752209646431,5349.6018277413195,5162.451445836207,5013.530952458399,4922.365910860245,4874.0872874229235,4842.732601570261,4813.686228972017,4785.495097090659,4749.265620883151,4715.754141250931,4687.665038076443,4658.282349854457,4629.742024622757,4597.048815618196,4564.639503710362,4534.9771882427085,4500.27726616069,4470.162637583919,4443.202117047325,4411.35426890079,4383.2134668585195,4352.77158601805,4320.3520428262345,4288.590689990121,4258.486734509347,4226.488929038134,4192.682044837858,4141.864709511577
Biopower - Dedicated/Moderate,5536.752209646431,5349.6018277413195,5162.451445836207,5013.530952458399,4922.365910860245,4874.0872874229235,4842.732601570261,4813.686228972017,4785.495097090659,4749.265620883151,4715.754141250931,4687.665038076443,4658.282349854457,4629.742024622757,4597.048815618196,4564.639503710362,4534.9771882427085,4500.27726616069,4470.162637583919,4443.202117047325,4411.35426890079,4383.2134668585195,4352.77158601805,4320.3520428262345,4288.590689990121,4258.486734509347,4226.488929038134,4192.682044837858,4141.864709511577
Biopower - Dedicated/Conservative,5536.752209646431,5349.6018277413195,5162.451445836207,5013.530952458399,4922.365910860245,4874.0872874229235,4842.732601570261,4813.686228972017,4785.495097090659,4749.265620883151,4715.754141250931,4687.665038076443,4658.282349854457,4629.742024622757,4597.048815618196,4564.639503710362,4534.9771882427085,4500.27726616069,4470.162637583919,4443.202117047325,4411.35426890079,4383.2134668585195,4352.77158601805,4320.3520428262345,4288.590689990121,4258.486734509347,4226.488929038134,4192.682044837858,4141.864709511577
6 changes: 3 additions & 3 deletions tests/data/Biopower/Market/20/df_gcc.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
Biopower - Dedicated/Advanced,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
Biopower - Dedicated/Moderate,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
Biopower - Dedicated/Conservative,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
Biopower - Dedicated/Advanced,100,100,100,100,100,100,100,100,100,100,100,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0
Biopower - Dedicated/Moderate,100,100,100,100,100,100,100,100,100,100,100,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0
Biopower - Dedicated/Conservative,100,100,100,100,100,100,100,100,100,100,100,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0
6 changes: 3 additions & 3 deletions tests/data/Biopower/Market/20/df_lcoe.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
Biopower - Dedicated/Advanced,194.94835778816145,176.77830490742872,174.12552221423013,171.732392948231,170.2601118196267,169.48023713674243,168.97367132465274,168.50434543450552,168.0487886115655,167.46326220404504,166.9215880889606,166.4675038311916,165.9924514410891,165.53096215051494,165.00225272925476,164.47806015367752,163.9982317391113,163.43683129783352,162.94954205399165,162.51323121007187,161.9977543493341,161.54221142033225,165.37632772762544,169.1222019963453,176.7722542220016,176.29047344845506,175.77838384322393,175.2373421092613,174.4240673090138
Biopower - Dedicated/Moderate,194.94835778816145,176.77830490742872,174.12552221423013,171.732392948231,170.2601118196267,169.48023713674243,168.97367132465274,168.50434543450552,168.0487886115655,167.46326220404504,166.9215880889606,166.4675038311916,165.9924514410891,165.53096215051494,165.00225272925476,164.47806015367752,163.9982317391113,163.43683129783352,162.94954205399165,162.51323121007187,161.9977543493341,161.54221142033225,165.37632772762544,169.1222019963453,176.7722542220016,176.29047344845506,175.77838384322393,175.2373421092613,174.4240673090138
Biopower - Dedicated/Conservative,194.94835778816145,176.77830490742872,174.12552221423013,171.732392948231,170.2601118196267,169.48023713674243,168.97367132465274,168.50434543450552,168.0487886115655,167.46326220404504,166.9215880889606,166.4675038311916,165.9924514410891,165.53096215051494,165.00225272925476,164.47806015367752,163.9982317391113,163.43683129783352,162.94954205399165,162.51323121007187,161.9977543493341,161.54221142033225,165.37632772762544,169.1222019963453,176.7722542220016,176.29047344845506,175.77838384322393,175.2373421092613,174.4240673090138
Biopower - Dedicated/Advanced,196.70809305132286,176.94537683934004,174.30043627059362,171.90955555438734,170.43861004440842,169.65946274617437,169.1533770422553,168.68450145090392,168.22938685306144,167.64443641127076,167.1033028657282,166.64967761436432,166.1751112432227,165.71409989426422,165.18594518973873,164.6623102889513,164.182999206063,163.6222125348806,163.13546361130454,162.69964265420703,162.1847521302715,161.7297343149476,160.14879925726322,158.54988633552196,155.7512390634456,155.26947419414088,154.75740173131825,154.21637838080434,153.4031317535629
Biopower - Dedicated/Moderate,196.70809305132286,176.94537683934004,174.30043627059362,171.90955555438734,170.43861004440842,169.65946274617437,169.1533770422553,168.68450145090392,168.22938685306144,167.64443641127076,167.1033028657282,166.64967761436432,166.1751112432227,165.71409989426422,165.18594518973873,164.6623102889513,164.182999206063,163.6222125348806,163.13546361130454,162.69964265420703,162.1847521302715,161.7297343149476,160.14879925726322,158.54988633552196,155.7512390634456,155.26947419414088,154.75740173131825,154.21637838080434,153.4031317535629
Biopower - Dedicated/Conservative,196.70809305132286,176.94537683934004,174.30043627059362,171.90955555438734,170.43861004440842,169.65946274617437,169.1533770422553,168.68450145090392,168.22938685306144,167.64443641127076,167.1033028657282,166.64967761436432,166.1751112432227,165.71409989426422,165.18594518973873,164.6623102889513,164.182999206063,163.6222125348806,163.13546361130454,162.69964265420703,162.1847521302715,161.7297343149476,160.14879925726322,158.54988633552196,155.7512390634456,155.26947419414088,154.75740173131825,154.21637838080434,153.4031317535629
6 changes: 3 additions & 3 deletions tests/data/Biopower/Market/20/df_tc.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Tax Credit,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035
10 year CRF/Moderate,0.12702259564219312,0.13222693346517525,0.13272129221754597,0.1328523791727318,0.13292942347774464,0.13297135628292311,0.13299902392250448,0.13302496650053922,0.13305043715370335,0.13308360074322392,0.13311471590507726,0.1331411284409474,0.1331690875026903,0.1331965740331903,0.13322846614757702,0.1332605177613048,0.1332902412484162,0.13332549384866624,0.13335651719488875,0.1333846362758556,0.13341828082774335,0.13344840247992695,0.13228803732989833,0.1311181665498143,0.12854315237237418,0.12854300358341064,0.12854284321132461,0.12854267122930013,0.1285424076640687
10 year CRF/Conservative,0.12702259564219312,0.13222693346517525,0.13272129221754597,0.1328523791727318,0.13292942347774464,0.13297135628292311,0.13299902392250448,0.13302496650053922,0.13305043715370335,0.13308360074322392,0.13311471590507726,0.1331411284409474,0.1331690875026903,0.1331965740331903,0.13322846614757702,0.1332605177613048,0.1332902412484162,0.13332549384866624,0.13335651719488875,0.1333846362758556,0.13341828082774335,0.13344840247992695,0.13228803732989833,0.1311181665498143,0.12854315237237418,0.12854300358341064,0.12854284321132461,0.12854267122930013,0.1285424076640687
ITC Schedule/*,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
PTC/Advanced,0,21.5724671903087,21.631369997200064,21.646944909708687,21.65609020823948,21.661065029758333,21.66434642790444,21.667422486410178,21.670441885293414,21.674372194177312,21.678058665413403,21.68118716265994,21.684498026773905,21.687752117450636,21.69152676368523,21.69531918924125,21.69883516114896,21.70300394094324,21.706671490792793,21.709994810463847,21.713970058048538,21.71752803151313,16.184821470506037,10.719699524371075,0.0,0.0,0.0,0.0,0.0
PTC/Moderate,0,21.5724671903087,21.631369997200064,21.646944909708687,21.65609020823948,21.661065029758333,21.66434642790444,21.667422486410178,21.670441885293414,21.674372194177312,21.678058665413403,21.68118716265994,21.684498026773905,21.687752117450636,21.69152676368523,21.69531918924125,21.69883516114896,21.70300394094324,21.706671490792793,21.709994810463847,21.713970058048538,21.71752803151313,16.184821470506037,10.719699524371075,0.0,0.0,0.0,0.0,0.0
PTC/Conservative,0,21.5724671903087,21.631369997200064,21.646944909708687,21.65609020823948,21.661065029758333,21.66434642790444,21.667422486410178,21.670441885293414,21.674372194177312,21.678058665413403,21.68118716265994,21.684498026773905,21.687752117450636,21.69152676368523,21.69531918924125,21.69883516114896,21.70300394094324,21.706671490792793,21.709994810463847,21.713970058048538,21.71752803151313,16.184821470506037,10.719699524371075,0.0,0.0,0.0,0.0,0.0
PTC/Advanced,0,23.300975951825972,23.364598386606506,23.381421249685346,23.39129932154696,23.39667275405947,23.400217076487515,23.403539606295364,23.406800936589505,23.411046164174238,23.415028016452027,23.41840718669082,23.42198333606765,23.425498162996565,23.429575255355214,23.433671551615646,23.437469243189174,23.44197204932989,23.445933464132043,23.449523067076033,23.453816834105844,23.457659892639867,23.308855220681643,23.157245633951653,22.817880586403202,22.817860751219108,22.817839371849708,22.817816444713433,22.81778130843871
PTC/Moderate,0,23.300975951825972,23.364598386606506,23.381421249685346,23.39129932154696,23.39667275405947,23.400217076487515,23.403539606295364,23.406800936589505,23.411046164174238,23.415028016452027,23.41840718669082,23.42198333606765,23.425498162996565,23.429575255355214,23.433671551615646,23.437469243189174,23.44197204932989,23.445933464132043,23.449523067076033,23.453816834105844,23.457659892639867,23.308855220681643,23.157245633951653,22.817880586403202,22.817860751219108,22.817839371849708,22.817816444713433,22.81778130843871
PTC/Conservative,0,23.300975951825972,23.364598386606506,23.381421249685346,23.39129932154696,23.39667275405947,23.400217076487515,23.403539606295364,23.406800936589505,23.411046164174238,23.415028016452027,23.41840718669082,23.42198333606765,23.425498162996565,23.429575255355214,23.433671551615646,23.437469243189174,23.44197204932989,23.445933464132043,23.449523067076033,23.453816834105844,23.457659892639867,23.308855220681643,23.157245633951653,22.817880586403202,22.817860751219108,22.817839371849708,22.817816444713433,22.81778130843871
PVD/Advanced,0.8219699982229064,0.8088556445885048,0.8084049033389302,0.8080240606669318,0.8077801319532827,0.8076474496038887,0.8075599356171437,0.8074779004633923,0.807397378689932,0.8072925680826879,0.8071942634944786,0.8071108406905069,0.8070225576600549,0.8069357911410374,0.8068351479212772,0.8067340342157056,0.8066402945026402,0.8065291541608669,0.806431380226699,0.8063427860428752,0.806236816092256,0.8061419728730304,0.8098166725853105,0.8135659225904811,0.8219804117276538,0.8219809045167693,0.8219814356700565,0.8219820052765272,0.8219828782096504
PVD/Moderate,0.8219699982229064,0.8088556445885048,0.8084049033389302,0.8080240606669318,0.8077801319532827,0.8076474496038887,0.8075599356171437,0.8074779004633923,0.807397378689932,0.8072925680826879,0.8071942634944786,0.8071108406905069,0.8070225576600549,0.8069357911410374,0.8068351479212772,0.8067340342157056,0.8066402945026402,0.8065291541608669,0.806431380226699,0.8063427860428752,0.806236816092256,0.8061419728730304,0.8098166725853105,0.8135659225904811,0.8219804117276538,0.8219809045167693,0.8219814356700565,0.8219820052765272,0.8219828782096504
PVD/Conservative,0.8219699982229064,0.8088556445885048,0.8084049033389302,0.8080240606669318,0.8077801319532827,0.8076474496038887,0.8075599356171437,0.8074779004633923,0.807397378689932,0.8072925680826879,0.8071942634944786,0.8071108406905069,0.8070225576600549,0.8069357911410374,0.8068351479212772,0.8067340342157056,0.8066402945026402,0.8065291541608669,0.806431380226699,0.8063427860428752,0.806236816092256,0.8061419728730304,0.8098166725853105,0.8135659225904811,0.8219804117276538,0.8219809045167693,0.8219814356700565,0.8219820052765272,0.8219828782096504
Expand Down
6 changes: 3 additions & 3 deletions tests/data/Biopower/Market/30/df_capex.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
Biopower - Dedicated/Advanced,5424.441677149275,5237.291295244163,5050.140913339052,4901.220419961243,4810.0553783630885,4761.776754925768,4730.422069073105,4701.375696474861,4673.184564593504,4636.955088385996,4603.443608753774,4575.354505579287,4545.9718173573,4517.431492125601,4484.738283121041,4452.3289712132055,4422.666655745553,4387.966733663533,4357.852105086763,4330.891584550169,4299.043736403634,4270.902934361364,4240.461053520893,4208.041510329079,4176.280157492965,4146.1762020121905,4114.178396540979,4080.3715123407014,4029.554177014421
Biopower - Dedicated/Moderate,5424.441677149275,5237.291295244163,5050.140913339052,4901.220419961243,4810.0553783630885,4761.776754925768,4730.422069073105,4701.375696474861,4673.184564593504,4636.955088385996,4603.443608753774,4575.354505579287,4545.9718173573,4517.431492125601,4484.738283121041,4452.3289712132055,4422.666655745553,4387.966733663533,4357.852105086763,4330.891584550169,4299.043736403634,4270.902934361364,4240.461053520893,4208.041510329079,4176.280157492965,4146.1762020121905,4114.178396540979,4080.3715123407014,4029.554177014421
Biopower - Dedicated/Conservative,5424.441677149275,5237.291295244163,5050.140913339052,4901.220419961243,4810.0553783630885,4761.776754925768,4730.422069073105,4701.375696474861,4673.184564593504,4636.955088385996,4603.443608753774,4575.354505579287,4545.9718173573,4517.431492125601,4484.738283121041,4452.3289712132055,4422.666655745553,4387.966733663533,4357.852105086763,4330.891584550169,4299.043736403634,4270.902934361364,4240.461053520893,4208.041510329079,4176.280157492965,4146.1762020121905,4114.178396540979,4080.3715123407014,4029.554177014421
Biopower - Dedicated/Advanced,5536.752209646431,5349.6018277413195,5162.451445836207,5013.530952458399,4922.365910860245,4874.0872874229235,4842.732601570261,4813.686228972017,4785.495097090659,4749.265620883151,4715.754141250931,4687.665038076443,4658.282349854457,4629.742024622757,4597.048815618196,4564.639503710362,4534.9771882427085,4500.27726616069,4470.162637583919,4443.202117047325,4411.35426890079,4383.2134668585195,4352.77158601805,4320.3520428262345,4288.590689990121,4258.486734509347,4226.488929038134,4192.682044837858,4141.864709511577
Biopower - Dedicated/Moderate,5536.752209646431,5349.6018277413195,5162.451445836207,5013.530952458399,4922.365910860245,4874.0872874229235,4842.732601570261,4813.686228972017,4785.495097090659,4749.265620883151,4715.754141250931,4687.665038076443,4658.282349854457,4629.742024622757,4597.048815618196,4564.639503710362,4534.9771882427085,4500.27726616069,4470.162637583919,4443.202117047325,4411.35426890079,4383.2134668585195,4352.77158601805,4320.3520428262345,4288.590689990121,4258.486734509347,4226.488929038134,4192.682044837858,4141.864709511577
Biopower - Dedicated/Conservative,5536.752209646431,5349.6018277413195,5162.451445836207,5013.530952458399,4922.365910860245,4874.0872874229235,4842.732601570261,4813.686228972017,4785.495097090659,4749.265620883151,4715.754141250931,4687.665038076443,4658.282349854457,4629.742024622757,4597.048815618196,4564.639503710362,4534.9771882427085,4500.27726616069,4470.162637583919,4443.202117047325,4411.35426890079,4383.2134668585195,4352.77158601805,4320.3520428262345,4288.590689990121,4258.486734509347,4226.488929038134,4192.682044837858,4141.864709511577
6 changes: 3 additions & 3 deletions tests/data/Biopower/Market/30/df_gcc.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tech_detail-scenario,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050
Biopower - Dedicated/Advanced,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
Biopower - Dedicated/Moderate,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
Biopower - Dedicated/Conservative,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
Biopower - Dedicated/Advanced,100,100,100,100,100,100,100,100,100,100,100,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0
Biopower - Dedicated/Moderate,100,100,100,100,100,100,100,100,100,100,100,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0
Biopower - Dedicated/Conservative,100,100,100,100,100,100,100,100,100,100,100,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0,100.0
Loading

0 comments on commit 0193a69

Please sign in to comment.