diff --git a/CITATION.cff b/CITATION.cff index 2632e399..358c871e 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -9,5 +9,5 @@ authors: given-names: Adam title: MUSE_OS -version: v1.5.5 -date-released: 2026-03-27 +version: v1.5.6 +date-released: 2026-04-22 diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst index 5a55cb17..c5055651 100644 --- a/docs/inputs/technodata.rst +++ b/docs/inputs/technodata.rst @@ -57,7 +57,7 @@ Variable costs (optional, default ``var_par = 0`` and ``var_exp = 1``) The exponent allows the model to take into account economies of scale (ie. As `Production` increases, the variable cost of the technology decreases). -Growth constraints (optional) +Capacity constraints (optional) ``max_capacity_addition`` represents the maximum addition of installed capacity per technology, per year in a period, per region. @@ -68,7 +68,7 @@ Growth constraints (optional) ``total_capacity_limit`` represents the total capacity limit per technology, region and year. - .. csv-table:: Techno-data: growth constraints + .. csv-table:: Techno-data: capacity constraints :header: technology, region, max_capacity_addition, max_capacity_growth, total_capacity_limit resBoilerElectric, region1, 10, 0.2, 100 @@ -84,8 +84,8 @@ Growth constraints (optional) * ``total_capacity_limit`` will restrict new addition to 100 - 4.9 = 95.1 PJ (so that total capacity in the investment year will not exceed 100 PJ). * Overall, the most restrictive constraint will apply, which in this case is 14.3 PJ. - Growth constraints are applied for each single agent in a multi-agent simulation. When only one agent is present, the growth constraints - apply individually to the "New" and "Retrofit" agent, when present. + Capacity constraints are applied separately for each agent. In multi-agent simulations, + each agent receives a proportion of the overall limit according to its agent quantity. If any of the three parameters are not provided in the technodata file, that particular constraint is not applied. @@ -95,6 +95,8 @@ Growth constraints (optional) Taking the above example, if the GrowthSeed is set to 10 PJ (higher than the existing capacity of 7.7 PJ), the MaxCapacityGrowth constraint will be applied as follows: 10 x (1 + 0.2)\ :sup:`5` - 4.9 = 19.9 PJ. + In multi-agent simulations, the growth seed for each agent is scaled by the agent quantity. + ``technical_life`` represents the number of years that a technology operates before it is decommissioned. diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst index 76b6165d..c5d58179 100644 --- a/docs/release-notes/index.rst +++ b/docs/release-notes/index.rst @@ -5,6 +5,8 @@ This is the list of changes to MUSE between each release. To update to the latest version, run ``pip install --upgrade muse-os`` + +* :ref:`/release-notes/v1.5.6.md` * :ref:`/release-notes/v1.5.5.md` * :ref:`/release-notes/v1.5.4.md` * :ref:`/release-notes/v1.5.3.md` diff --git a/docs/release-notes/v1.5.6.md b/docs/release-notes/v1.5.6.md new file mode 100644 index 00000000..ff799458 --- /dev/null +++ b/docs/release-notes/v1.5.6.md @@ -0,0 +1,6 @@ +# Release notes for MUSE v1.5.6 (April 22, 2026) + +This release fixes an issue affecting capacity constraints in models with multiple +agents. Whereas previously, entire capacity limits were applied to each agent, +limits for each agent are now scaled according to the agent's quantity. For example, if a technology has an addition limit of 100 MW per year, then an agent with a quantity of 0.5 would have an addition limit of 50 MW per year (noting that quantities for all agents should sum to 1). +See `github`{831} and the updated documentation [here](https://muse-os.readthedocs.io/en/latest/inputs/technodata.html) for more details. diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv index a893604c..e562e24d 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv @@ -6,117 +6,122 @@ A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,1.9063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2025 A2,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2025 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2025 A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2025 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2025 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,1.9063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2030 A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2030 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2030 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2030 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2030 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2030 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2030 A1,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 A2,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2030 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2030 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2035 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2035 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2035 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2035 -A1,2.4531,r1,2035,r1,power,windturbine,newcapa,2035 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2035 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2035 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2035 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2035 -A2,2.4531,r1,2035,r1,power,windturbine,newcapa,2035 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2035 -A1,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2035 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2035 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2035 -A2,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2035 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2040 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2040 A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2040 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2040 -A1,2.4531,r1,2035,r1,power,windturbine,newcapa,2040 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2040 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2040 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2040 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2040 -A2,2.4531,r1,2035,r1,power,windturbine,newcapa,2040 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2040 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2040 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2040 -A2,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2040 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2045 A2,15.5000,r1,2045,r1,residential,gasboiler,newcapa,2045 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2045 -A1,2.4531,r1,2035,r1,power,windturbine,newcapa,2045 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2045 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 A1,1.5000,r1,2045,r1,power,windturbine,newcapa,2045 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2045 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2045 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2045 -A2,2.4531,r1,2035,r1,power,windturbine,newcapa,2045 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 A2,1.5000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2045 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 A1,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2045 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2045 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2045 -A2,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2045 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 A2,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 A2,15.5000,r1,2045,r1,residential,gasboiler,newcapa,2050 A2,11.5000,r1,2050,r1,residential,gasboiler,newcapa,2050 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2050 -A1,2.4531,r1,2035,r1,power,windturbine,newcapa,2050 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2050 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 A1,1.5000,r1,2045,r1,power,windturbine,newcapa,2050 -A1,2.8359,r1,2050,r1,power,windturbine,newcapa,2050 +A1,1.8867,r1,2050,r1,power,windturbine,newcapa,2050 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2050 -A2,2.4531,r1,2035,r1,power,windturbine,newcapa,2050 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 A2,1.5000,r1,2045,r1,power,windturbine,newcapa,2050 -A2,2.8359,r1,2050,r1,power,windturbine,newcapa,2050 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2050 +A2,1.8867,r1,2050,r1,power,windturbine,newcapa,2050 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 A1,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2050 A1,1.9333,r1,2050,r1,gas,gassupply1,newcapa,2050 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2050 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2050 -A2,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2050 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 A2,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2050 A2,1.9333,r1,2050,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index 3b7e1e1d..c935d740 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.4241,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.7496,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.3746,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.6283,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.4241,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.7496,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.3746,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.6283,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.4241,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.7496,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.3746,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.6283,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.4241,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.7496,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.3746,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.6283,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,19.4241,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.7496,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.3746,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6283,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,19.4241,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.7496,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.3746,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.6283,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,19.1390,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.5111,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.4945,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.9201,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.1390,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.5111,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.4945,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.9201,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,19.1390,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.5111,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.4945,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.9201,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.1390,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.5111,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.4945,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.9201,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,19.1390,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.5111,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.4945,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.9201,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,19.1390,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.5111,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.4945,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.9201,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,19.6160,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,18.5149,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,14.2099,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.9896,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.6160,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,18.5149,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.2099,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.9896,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,19.6160,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,18.5149,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,14.2099,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.9896,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.6160,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.5149,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.2099,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.9896,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,19.6160,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,18.5149,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,14.2099,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,13.9896,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,19.6160,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.5149,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,14.2099,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.9896,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,20.0602,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,18.6565,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.1714,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,15.8906,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,20.0602,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.6565,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.1714,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,15.8906,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,20.0602,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,18.6565,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.1714,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,15.8906,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,20.0602,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.6565,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.1714,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,15.8906,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,20.0602,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,18.6565,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,16.1714,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,15.8906,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,20.0602,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.6565,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,16.1714,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,15.8906,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,20.6313,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,18.8385,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,18.9125,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,18.5540,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,20.6313,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,18.8385,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,18.9125,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,18.5540,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,20.6313,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,18.8385,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,18.9125,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,18.5540,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,20.6313,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,18.8385,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,18.9125,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,18.5540,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,20.6313,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,18.8385,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,18.9125,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,18.5540,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,20.6313,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,18.8385,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,18.9125,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,18.5540,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,21.0754,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,18.9800,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,21.6283,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.2092,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,21.0754,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.9800,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,21.6283,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.2092,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,21.0754,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,18.9800,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,21.6283,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.2092,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,21.0754,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.9800,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,21.6283,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.2092,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,21.0754,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,18.9800,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,21.6283,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,21.2092,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,21.0754,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,18.9800,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.6283,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.2092,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index 80d19dfa..68a8c173 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -6,113 +6,118 @@ A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,1.9063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2025 A2,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2025 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2025 A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2025 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2025 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,1.9063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2030 A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2030 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2030 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2030 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2030 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2030 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2030 A1,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 A2,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2030 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2030 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2035 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2035 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2035 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2035 -A1,2.4531,r1,2035,r1,power,windturbine,newcapa,2035 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2035 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2035 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2035 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2035 -A2,2.4531,r1,2035,r1,power,windturbine,newcapa,2035 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2035 -A1,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2035 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2035 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2035 -A2,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2035 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2040 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2040 A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2040 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2040 -A1,2.4531,r1,2035,r1,power,windturbine,newcapa,2040 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2040 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2040 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2040 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2040 -A2,2.4531,r1,2035,r1,power,windturbine,newcapa,2040 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2040 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2040 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2040 -A2,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2040 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2045 -A2,7.9063,r1,2045,r1,residential,gasboiler,newcapa,2045 -A2,7.5938,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2045 -A1,2.4531,r1,2035,r1,power,windturbine,newcapa,2045 +A2,11.7031,r1,2045,r1,residential,gasboiler,newcapa,2045 +A2,3.7969,r1,2045,r1,residential,heatpump,newcapa,2045 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2045 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 -A1,5.2969,r1,2045,r1,power,windturbine,newcapa,2045 -A2,2.6719,r1,2025,r1,power,windturbine,newcapa,2045 +A1,3.3984,r1,2045,r1,power,windturbine,newcapa,2045 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2045 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2045 -A2,2.4531,r1,2035,r1,power,windturbine,newcapa,2045 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 -A2,5.2969,r1,2045,r1,power,windturbine,newcapa,2045 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2045 +A2,3.3984,r1,2045,r1,power,windturbine,newcapa,2045 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2045 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2045 -A2,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2045 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 -A2,7.9063,r1,2045,r1,residential,gasboiler,newcapa,2050 -A2,7.5938,r1,2045,r1,residential,heatpump,newcapa,2050 +A2,11.7031,r1,2045,r1,residential,gasboiler,newcapa,2050 +A2,3.7969,r1,2045,r1,residential,heatpump,newcapa,2050 A2,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,1.1875,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,3.8750,r1,2030,r1,power,windturbine,newcapa,2050 -A1,2.4531,r1,2035,r1,power,windturbine,newcapa,2050 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2050 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 -A1,5.2969,r1,2045,r1,power,windturbine,newcapa,2050 -A1,8.5859,r1,2050,r1,power,windturbine,newcapa,2050 +A1,3.3984,r1,2045,r1,power,windturbine,newcapa,2050 +A1,7.6367,r1,2050,r1,power,windturbine,newcapa,2050 A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2050 -A2,2.4531,r1,2035,r1,power,windturbine,newcapa,2050 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 -A2,5.2969,r1,2045,r1,power,windturbine,newcapa,2050 -A2,8.5859,r1,2050,r1,power,windturbine,newcapa,2050 -A1,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2050 +A2,3.3984,r1,2045,r1,power,windturbine,newcapa,2050 +A2,7.6367,r1,2050,r1,power,windturbine,newcapa,2050 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 -A2,4.8995,r1,2025,r1,gas,gassupply1,newcapa,2050 -A2,3.2372,r1,2030,r1,gas,gassupply1,newcapa,2050 -A2,4.4549,r1,2035,r1,gas,gassupply1,newcapa,2050 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index 3b563452..7283f612 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.4241,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.7496,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.3746,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.6283,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.4241,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.7496,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.3746,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.6283,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.4241,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.7496,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.3746,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.6283,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.4241,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.7496,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.3746,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.6283,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,19.4241,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.7496,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.3746,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6283,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,19.4241,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.7496,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.3746,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.6283,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,19.1390,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.5111,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.4945,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.9201,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.1390,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.5111,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.4945,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.9201,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,19.1390,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.5111,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.4945,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.9201,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.1390,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.5111,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.4945,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.9201,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,19.1390,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.5111,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.4945,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.9201,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,19.1390,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.5111,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.4945,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.9201,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,19.6160,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,18.5149,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,14.2099,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.9896,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.6160,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,18.5149,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.2099,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.9896,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,19.6160,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,18.5149,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,14.2099,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.9896,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.6160,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.5149,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.2099,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.9896,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,19.6160,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,18.5149,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,14.2099,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,13.9896,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,19.6160,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.5149,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,14.2099,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.9896,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,20.0602,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,18.6565,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.1714,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,15.8906,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,20.0602,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.6565,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.1714,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,15.8906,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,20.0602,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,18.6565,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.1714,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,15.8906,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,20.0602,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.6565,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.1714,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,15.8906,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,20.0602,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,18.6565,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,16.1714,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,15.8906,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,20.0602,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.6565,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,16.1714,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,15.8906,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,19.9988,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,18.7239,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.1950,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,17.1952,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.9988,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,18.7239,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,16.1950,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,17.1952,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,19.9988,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,18.7239,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.1950,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,17.1952,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.9988,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,18.7239,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,16.1950,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,17.1952,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,19.9988,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,18.7239,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,16.1950,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,17.1952,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,19.9988,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,18.7239,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,16.1950,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,17.1952,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,19.8014,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,18.6255,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.6967,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.8549,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.8014,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.6255,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.6967,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.8549,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,19.8014,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,18.6255,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.6967,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.8549,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.8014,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.6255,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.6967,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.8549,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,19.8014,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,18.6255,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.6967,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.8549,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,19.8014,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,18.6255,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.6967,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.8549,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py index d5f08549..09309c07 100644 --- a/src/muse/agents/agent.py +++ b/src/muse/agents/agent.py @@ -22,7 +22,7 @@ def __init__( region: str = "", assets: xr.Dataset | None = None, category: str | None = None, - quantity: float | None = 1, + quantity: float = 1.0, timeslice_level: str | None = None, ): """Creates a standard MUSE agent. @@ -118,7 +118,7 @@ def __init__( demand_threshold: float | None = None, category: str | None = None, asset_threshold: float = 1e-4, - quantity: float | None = 1, + quantity: float = 1.0, spend_limit: int = 0, timeslice_level: str | None = None, **kwargs, @@ -352,6 +352,13 @@ def next( year=[current_year, investment_year], ) + # Scale capacity constraints by agent quantity + technologies = technologies.copy() + for var in ["max_capacity_addition", "total_capacity_limit"]: + if var in technologies: + technologies[var] = self.quantity * technologies[var] + technologies["growth_seed"] = self.quantity * technologies["growth_seed"] + # Calculate constraints constraints = self.constraints( demand=search.demand, diff --git a/src/muse/constraints.py b/src/muse/constraints.py index 13462768..ff12a115 100644 --- a/src/muse/constraints.py +++ b/src/muse/constraints.py @@ -375,8 +375,7 @@ def max_capacity_expansion( # MaxCapacityGrowth constraint if "max_capacity_growth" in techs: - seed = techs.get("growth_seed", 1) - seeded_initial = np.maximum(initial, seed) + seeded_initial = np.maximum(initial, techs.growth_seed) growth_cap = ( (seeded_initial * (techs.max_capacity_growth + 1) ** time_frame) - forecasted diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py index ee442e40..964ab011 100644 --- a/src/muse/readers/csv.py +++ b/src/muse/readers/csv.py @@ -137,6 +137,7 @@ "minimum_service_factor": 0, "search_rule": "all", "decision_method": "single", + "growth_seed": 1.0, } @@ -417,6 +418,7 @@ def read_technodictionary_csv(path: Path) -> pd.DataFrame: "technology", "technical_life", "fix_par", + "growth_seed", } data = read_csv( path, diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index b30dac3d..dacccd7a 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -4,78 +4,75 @@ A2,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,7.0117,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,2.4883,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A2,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A2,7.0117,r1,2025,r1,residential,gasboiler,newcapa,2025 -A2,2.4883,r1,2025,r1,residential,heatpump,newcapa,2025 +A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,1.2118,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,13.2128,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,7.0117,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,1.7966,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,2.4883,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,3.7034,r1,2030,r1,residential,heatpump,newcapa,2030 -A2,7.0117,r1,2025,r1,residential,gasboiler,newcapa,2030 -A2,1.7966,r1,2030,r1,residential,gasboiler,newcapa,2030 -A2,2.4883,r1,2025,r1,residential,heatpump,newcapa,2030 -A2,3.7034,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,1.2118,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,0.9169,r1,2030,r1,power,gasCCGT,newcapa,2030 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,4.2558,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,1.2442,r1,2030,r1,residential,heatpump,newcapa,2030 +A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A2,4.2558,r1,2030,r1,residential,gasboiler,newcapa,2030 +A2,1.2442,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,2.4883,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,13.2128,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.5480,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,1.7966,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,0.7964,r1,2035,r1,residential,gasboiler,newcapa,2035 -A1,3.7034,r1,2030,r1,residential,heatpump,newcapa,2035 -A1,11.7036,r1,2035,r1,residential,heatpump,newcapa,2035 -A2,1.7966,r1,2030,r1,residential,gasboiler,newcapa,2035 -A2,0.7964,r1,2035,r1,residential,gasboiler,newcapa,2035 -A2,3.7034,r1,2030,r1,residential,heatpump,newcapa,2035 -A2,11.7036,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,1.2118,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,0.9169,r1,2030,r1,power,gasCCGT,newcapa,2035 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,18.4306,r1,2035,r1,power,windturbine,newcapa,2035 -A1,13.2128,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.5480,r1,2030,r1,gas,gassupply1,newcapa,2035 -A1,0.7964,r1,2035,r1,residential,gasboiler,newcapa,2040 -A1,11.7036,r1,2035,r1,residential,heatpump,newcapa,2040 -A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2040 -A2,0.7964,r1,2035,r1,residential,gasboiler,newcapa,2040 -A2,11.7036,r1,2035,r1,residential,heatpump,newcapa,2040 -A2,8.5000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,1.2118,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,0.9169,r1,2030,r1,power,gasCCGT,newcapa,2040 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,18.4306,r1,2035,r1,power,windturbine,newcapa,2040 -A1,9.5932,r1,2040,r1,power,windturbine,newcapa,2040 -A1,13.2128,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.5480,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2045 -A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 -A2,8.5000,r1,2040,r1,residential,heatpump,newcapa,2045 -A2,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,1.2118,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,0.9169,r1,2030,r1,power,gasCCGT,newcapa,2045 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,18.4306,r1,2035,r1,power,windturbine,newcapa,2045 -A1,9.5932,r1,2040,r1,power,windturbine,newcapa,2045 -A1,7.5928,r1,2045,r1,power,windturbine,newcapa,2045 -A1,13.2128,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.5480,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,12.0262,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,4.2558,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,10.6483,r1,2035,r1,residential,gasboiler,newcapa,2035 +A1,1.2442,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,1.8517,r1,2035,r1,residential,heatpump,newcapa,2035 +A2,4.2558,r1,2030,r1,residential,gasboiler,newcapa,2035 +A2,10.6483,r1,2035,r1,residential,gasboiler,newcapa,2035 +A2,1.2442,r1,2030,r1,residential,heatpump,newcapa,2035 +A2,1.8517,r1,2035,r1,residential,heatpump,newcapa,2035 +A1,2.4883,r1,2030,r1,power,windturbine,newcapa,2035 +A1,3.7034,r1,2035,r1,power,windturbine,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,12.0262,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,10.4600,r1,2035,r1,gas,gassupply1,newcapa,2035 +A1,10.6483,r1,2035,r1,residential,gasboiler,newcapa,2040 +A1,2.6482,r1,2040,r1,residential,gasboiler,newcapa,2040 +A1,1.8517,r1,2035,r1,residential,heatpump,newcapa,2040 +A1,5.8518,r1,2040,r1,residential,heatpump,newcapa,2040 +A2,10.6483,r1,2035,r1,residential,gasboiler,newcapa,2040 +A2,2.6482,r1,2040,r1,residential,gasboiler,newcapa,2040 +A2,1.8517,r1,2035,r1,residential,heatpump,newcapa,2040 +A2,5.8518,r1,2040,r1,residential,heatpump,newcapa,2040 +A1,2.4883,r1,2030,r1,power,windturbine,newcapa,2040 +A1,3.7034,r1,2035,r1,power,windturbine,newcapa,2040 +A1,9.2153,r1,2040,r1,power,windturbine,newcapa,2040 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,12.0262,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,10.4600,r1,2035,r1,gas,gassupply1,newcapa,2040 +A1,2.6482,r1,2040,r1,residential,gasboiler,newcapa,2045 +A1,2.1830,r1,2045,r1,residential,gasboiler,newcapa,2045 +A1,5.8518,r1,2040,r1,residential,heatpump,newcapa,2045 +A1,13.3170,r1,2045,r1,residential,heatpump,newcapa,2045 +A2,2.6482,r1,2040,r1,residential,gasboiler,newcapa,2045 +A2,2.1830,r1,2045,r1,residential,gasboiler,newcapa,2045 +A2,5.8518,r1,2040,r1,residential,heatpump,newcapa,2045 +A2,13.3170,r1,2045,r1,residential,heatpump,newcapa,2045 +A1,2.4883,r1,2030,r1,power,windturbine,newcapa,2045 +A1,3.7034,r1,2035,r1,power,windturbine,newcapa,2045 +A1,9.2153,r1,2040,r1,power,windturbine,newcapa,2045 +A1,22.9306,r1,2045,r1,power,windturbine,newcapa,2045 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,12.0262,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,10.4600,r1,2035,r1,gas,gassupply1,newcapa,2045 +A1,2.1830,r1,2045,r1,residential,gasboiler,newcapa,2050 +A1,13.3170,r1,2045,r1,residential,heatpump,newcapa,2050 A1,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 -A2,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 +A2,2.1830,r1,2045,r1,residential,gasboiler,newcapa,2050 +A2,13.3170,r1,2045,r1,residential,heatpump,newcapa,2050 A2,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,1.2118,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,0.9169,r1,2030,r1,power,gasCCGT,newcapa,2050 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,18.4306,r1,2035,r1,power,windturbine,newcapa,2050 -A1,9.5932,r1,2040,r1,power,windturbine,newcapa,2050 -A1,7.5928,r1,2045,r1,power,windturbine,newcapa,2050 -A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,13.2128,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.5480,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,2.4883,r1,2030,r1,power,windturbine,newcapa,2050 +A1,3.7034,r1,2035,r1,power,windturbine,newcapa,2050 +A1,9.2153,r1,2040,r1,power,windturbine,newcapa,2050 +A1,22.9306,r1,2045,r1,power,windturbine,newcapa,2050 +A1,11.2964,r1,2050,r1,power,windturbine,newcapa,2050 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,12.0262,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,10.4600,r1,2035,r1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 4e87667f..04bd3a0f 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,28.3773,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.5994,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.1973,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,28.3773,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.5994,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,20.1973,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,28.3773,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.5994,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.1973,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,28.3773,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.5994,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,20.1973,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,28.3773,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.5994,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,20.1973,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,28.3773,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.5994,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,20.1591,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.7571,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.8628,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.1591,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.7571,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.8628,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,20.1591,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.7571,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.8628,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.1591,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.7571,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.8628,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,20.1591,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.7571,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.8628,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,20.1591,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.7571,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.8628,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,19.6923,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.5550,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,16.5693,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.6923,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.5550,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,16.5693,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,19.6923,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.5550,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,16.5693,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.6923,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.5550,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,16.5693,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,19.6923,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.5550,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,16.5693,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,19.6923,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.5550,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,16.5693,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,19.9194,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.9883,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,17.3472,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.9194,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.9883,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,17.3472,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,19.9194,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.9883,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,17.3472,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.9194,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.9883,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,17.3472,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,19.9194,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.9883,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,17.3472,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,19.9194,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.9883,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,17.3472,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,20.3584,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,10.7408,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.2552,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,20.3584,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.7408,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.2552,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,20.3584,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,10.7408,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.2552,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,20.3584,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.7408,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.2552,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,20.3584,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,10.7408,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.2552,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,20.3584,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,10.7408,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.2552,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,20.7565,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,10.9000,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,11.6110,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,20.7565,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.9000,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.6110,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,20.7565,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,10.9000,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,11.6110,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,20.7565,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.9000,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.6110,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,20.7565,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,10.9000,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.6110,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,20.7565,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.9000,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.6110,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/tests/test_csv_readers.py b/tests/test_csv_readers.py index d02c6812..40bf3187 100644 --- a/tests/test_csv_readers.py +++ b/tests/test_csv_readers.py @@ -345,6 +345,7 @@ def test_read_technodictionary(model_path): "utilization_factor": "float64", "minimum_service_factor": "float64", "interest_rate": "float64", + "growth_seed": "float64", "agent1": "int64", }, ) @@ -383,6 +384,7 @@ def test_read_technodictionary(model_path): "utilization_factor": 0.9, "minimum_service_factor": 0.0, "interest_rate": 0.1, + "growth_seed": 1.0, "agent1": 1, } assert_single_coordinate(data, coord, expected) @@ -788,6 +790,7 @@ def test_read_technologies(model_path): "flexible_inputs": "float64", "unit": "object", "comm_usage": "object", + "growth_seed": "float64", }, ) assert DatasetSchema.from_ds(data) == expected_schema @@ -851,6 +854,7 @@ def test_read_technologies__timeslice(timeslice_model_path): "minimum_service_factor": "float64", "unit": "object", "comm_usage": "object", + "growth_seed": "float64", }, ) assert DatasetSchema.from_ds(data) == expected_schema @@ -907,6 +911,7 @@ def test_read_technodata(model_path): "flexible_inputs": "float64", "unit": "object", "comm_usage": "object", + "growth_seed": "float64", }, ) assert DatasetSchema.from_ds(data) == expected_schema @@ -964,6 +969,7 @@ def test_read_technodata__trade(trade_model_path): "cap_par": "float64", "fix_par": "float64", "comm_usage": "object", + "growth_seed": "float64", }, ) assert DatasetSchema.from_ds(data) == expected_schema diff --git a/tests/test_read_csv.py b/tests/test_read_csv.py index a09e10c2..84e6e533 100644 --- a/tests/test_read_csv.py +++ b/tests/test_read_csv.py @@ -64,6 +64,7 @@ def test_read_technodictionary_csv(model_path): "technology", "technical_life", "fix_par", + "growth_seed", } extra_columns = { "agent1",