From b906d9f0cb9a7bad5751a5e31df5203c45948341 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 9 Aug 2024 13:35:37 +0100 Subject: [PATCH 1/6] Change weighted sum normalization --- src/muse/decisions.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/muse/decisions.py b/src/muse/decisions.py index 6c62b922f..b75b2a446 100644 --- a/src/muse/decisions.py +++ b/src/muse/decisions.py @@ -124,9 +124,9 @@ def mean(objectives: Dataset, *args, **kwargs) -> DataArray: def weighted_sum(objectives: Dataset, parameters: Mapping[str, float]) -> DataArray: r"""Weighted sum over normalized objectives. - The objectives are each normalized to [0, 1] over the `replacement` - dimension. Furthermore, the dimensions other than `asset` and `replacement` - are reduced by taking the mean. + The objectives are each normalized to [-1, 1] over the `replacement` + dimension by dividing by the maximum absolute value. Furthermore, the dimensions + other than `asset` and `replacement` are reduced by taking the mean. More specifically, the objective function is: @@ -145,12 +145,12 @@ def weighted_sum(objectives: Dataset, parameters: Mapping[str, float]) -> DataAr # normalize input if given in DECISION_PARAMETERS format if not isinstance(parameters, Mapping): parameters = {u[0]: coeff_sign(u[1], u[2]) for u in parameters} + # normalize objectives if len(objectives.replacement): - minimum = objectives.min("replacement") - norm = objectives.max("replacement") - minimum - norm = norm.where(norm.map(fabs) > 1e-12, 1) - normalized = (objectives - minimum) / norm + norm = objectives.map(fabs).max("replacement") + norm = norm.where(norm > 1e-12, 1) + normalized = objectives / norm else: normalized = objectives From f9f4f8a90c92b68bfa1e78b64c1734da3430fe35 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 9 Aug 2024 13:47:51 +0100 Subject: [PATCH 2/6] Modify test --- tests/test_decisions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_decisions.py b/tests/test_decisions.py index fae36c25b..11a5789c1 100644 --- a/tests/test_decisions.py +++ b/tests/test_decisions.py @@ -35,8 +35,8 @@ def test_weighted_sum(objectives): weights = {"a": -1, "c": 2} def normalize(objective): - min, max = objective.min("replacement"), objective.max("replacement") - return (objective - min) / (max - min) + norm = abs(objective).max("replacement") + return objective / norm expected = ( normalize(objectives.a) * weights["a"] From c33d78cde6c4ac871056757652ab98ab5d3f56f8 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 9 Aug 2024 16:33:26 +0100 Subject: [PATCH 3/6] Modify tutorial model --- .../Results/Gas/Capacity/2020.csv | 14 +- .../Results/Gas/Capacity/2025.csv | 30 +-- .../Results/Gas/Capacity/2030.csv | 48 ++-- .../Results/Gas/Capacity/2035.csv | 58 +++-- .../Results/Gas/Capacity/2040.csv | 69 ++++-- .../Results/Gas/Capacity/2045.csv | 81 +++++-- .../Results/Gas/Capacity/2050.csv | 101 ++++++-- .../Results/MCACapacity.csv | 184 ++++++++------- .../1-single-objective/Results/MCAPrices.csv | 144 ++++++------ .../Results/Power/Capacity/2020.csv | 21 +- .../Results/Power/Capacity/2025.csv | 49 ++-- .../Results/Power/Capacity/2030.csv | 70 ++++-- .../Results/Power/Capacity/2035.csv | 94 +++++--- .../Results/Power/Capacity/2040.csv | 121 +++++++--- .../Results/Power/Capacity/2045.csv | 150 ++++++++---- .../Results/Power/Capacity/2050.csv | 186 ++++++++++----- .../Results/Residential/Capacity/2020.csv | 10 +- .../Results/Residential/Capacity/2025.csv | 22 +- .../Results/Residential/Capacity/2030.csv | 34 ++- .../Results/Residential/Capacity/2035.csv | 46 ++-- .../Results/Residential/Capacity/2040.csv | 58 +++-- .../Results/Residential/Capacity/2045.csv | 70 ++++-- .../Results/Residential/Capacity/2050.csv | 82 ++++--- .../Results/Residential/Supply/2020.csv | 36 +-- .../Results/Residential/Supply/2025.csv | 84 ++++--- .../Results/Residential/Supply/2030.csv | 96 ++++++-- .../Results/Residential/Supply/2035.csv | 96 ++++++-- .../Results/Residential/Supply/2040.csv | 96 ++++++-- .../Results/Residential/Supply/2045.csv | 96 ++++++-- .../Results/Residential/Supply/2050.csv | 96 ++++++-- .../1-single-objective/technodata/Agents.csv | 2 +- .../Results/Gas/Capacity/2020.csv | 9 +- .../Results/Gas/Capacity/2025.csv | 23 +- .../Results/Gas/Capacity/2030.csv | 39 ++-- .../Results/Gas/Capacity/2035.csv | 49 ++-- .../Results/Gas/Capacity/2040.csv | 49 ++-- .../Results/Gas/Capacity/2045.csv | 49 ++-- .../Results/Gas/Capacity/2050.csv | 57 +++-- .../Results/MCACapacity.csv | 160 +++++++------ .../Results/MCAPrices.csv | 144 ++++++------ .../Results/Power/Capacity/2020.csv | 28 +-- .../Results/Power/Capacity/2025.csv | 75 +++--- .../Results/Power/Capacity/2030.csv | 91 ++++---- .../Results/Power/Capacity/2035.csv | 127 +++++----- .../Results/Power/Capacity/2040.csv | 147 ++++++------ .../Results/Power/Capacity/2045.csv | 167 +++++++------ .../Results/Power/Capacity/2050.csv | 221 ++++++++---------- .../Results/Residential/Capacity/2020.csv | 10 +- .../Results/Residential/Capacity/2025.csv | 10 +- .../Results/Residential/Capacity/2030.csv | 30 ++- .../Results/Residential/Capacity/2035.csv | 38 +-- .../Results/Residential/Capacity/2040.csv | 46 ++-- .../Results/Residential/Capacity/2045.csv | 54 +++-- .../Results/Residential/Capacity/2050.csv | 62 ++--- .../Results/Residential/Supply/2020.csv | 36 +-- .../Results/Residential/Supply/2025.csv | 60 +++-- .../Results/Residential/Supply/2030.csv | 72 ++++-- .../Results/Residential/Supply/2035.csv | 72 ++++-- .../Results/Residential/Supply/2040.csv | 60 +++-- .../Results/Residential/Supply/2045.csv | 48 ++-- .../Results/Residential/Supply/2050.csv | 48 ++-- .../technodata/Agents.csv | 2 +- .../2-add-agent/generate_models.py | 8 +- 63 files changed, 2690 insertions(+), 1745 deletions(-) diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv index 291295ece..2f57be103 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv @@ -1,9 +1,9 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.77330000000 -0,2030,R1,gassupply1,2020,10.27330000000 -0,2035,R1,gassupply1,2020,2.77330000000 -0,2040,R1,gassupply1,2020,2.77330000000 -0,2045,R1,gassupply1,2020,2.77330000000 -0,2050,R1,gassupply1,2020,2.77330000000 -0,2059,R1,gassupply1,2020,2.77330000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv index 36a596a70..8199f0cf7 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv @@ -1,17 +1,17 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.77330000000 -0,2030,R1,gassupply1,2020,10.27330000000 -0,2035,R1,gassupply1,2020,2.77330000000 -0,2040,R1,gassupply1,2020,2.77330000000 -0,2045,R1,gassupply1,2020,2.77330000000 -0,2050,R1,gassupply1,2020,2.77330000000 -0,2059,R1,gassupply1,2020,2.77330000000 -1,2030,R1,gassupply1,2025,11.99330000000 -1,2035,R1,gassupply1,2025,11.99330000000 -1,2040,R1,gassupply1,2025,11.99330000000 -1,2045,R1,gassupply1,2025,11.99330000000 -1,2050,R1,gassupply1,2025,11.99330000000 -1,2059,R1,gassupply1,2025,11.99330000000 -1,2060,R1,gassupply1,2025,11.99330000000 -1,2064,R1,gassupply1,2025,11.99330000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,12.17660000000 +1,2035,R1,gassupply1,2025,12.17660000000 +1,2040,R1,gassupply1,2025,12.17660000000 +1,2045,R1,gassupply1,2025,12.17660000000 +1,2050,R1,gassupply1,2025,12.17660000000 +1,2059,R1,gassupply1,2025,12.17660000000 +1,2060,R1,gassupply1,2025,12.17660000000 +1,2064,R1,gassupply1,2025,12.17660000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv index f022295a9..fca4d4db3 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv @@ -1,26 +1,26 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.77330000000 -0,2030,R1,gassupply1,2020,10.27330000000 -0,2035,R1,gassupply1,2020,2.77330000000 -0,2040,R1,gassupply1,2020,2.77330000000 -0,2045,R1,gassupply1,2020,2.77330000000 -0,2050,R1,gassupply1,2020,2.77330000000 -0,2059,R1,gassupply1,2020,2.77330000000 -1,2030,R1,gassupply1,2025,11.99330000000 -1,2035,R1,gassupply1,2025,11.99330000000 -1,2040,R1,gassupply1,2025,11.99330000000 -1,2045,R1,gassupply1,2025,11.99330000000 -1,2050,R1,gassupply1,2025,11.99330000000 -1,2059,R1,gassupply1,2025,11.99330000000 -1,2060,R1,gassupply1,2025,11.99330000000 -1,2064,R1,gassupply1,2025,11.99330000000 -2,2035,R1,gassupply1,2030,9.52420000000 -2,2040,R1,gassupply1,2030,9.52420000000 -2,2045,R1,gassupply1,2030,9.52420000000 -2,2050,R1,gassupply1,2030,9.52420000000 -2,2059,R1,gassupply1,2030,9.52420000000 -2,2060,R1,gassupply1,2030,9.52420000000 -2,2064,R1,gassupply1,2030,9.52420000000 -2,2065,R1,gassupply1,2030,9.52420000000 -2,2069,R1,gassupply1,2030,9.52420000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,12.17660000000 +1,2035,R1,gassupply1,2025,12.17660000000 +1,2040,R1,gassupply1,2025,12.17660000000 +1,2045,R1,gassupply1,2025,12.17660000000 +1,2050,R1,gassupply1,2025,12.17660000000 +1,2059,R1,gassupply1,2025,12.17660000000 +1,2060,R1,gassupply1,2025,12.17660000000 +1,2064,R1,gassupply1,2025,12.17660000000 +2,2035,R1,gassupply1,2030,14.17140000000 +2,2040,R1,gassupply1,2030,14.17140000000 +2,2045,R1,gassupply1,2030,14.17140000000 +2,2050,R1,gassupply1,2030,14.17140000000 +2,2059,R1,gassupply1,2030,14.17140000000 +2,2060,R1,gassupply1,2030,14.17140000000 +2,2064,R1,gassupply1,2030,14.17140000000 +2,2065,R1,gassupply1,2030,14.17140000000 +2,2069,R1,gassupply1,2030,14.17140000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv index f022295a9..1ca7fb8cf 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv @@ -1,26 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.77330000000 -0,2030,R1,gassupply1,2020,10.27330000000 -0,2035,R1,gassupply1,2020,2.77330000000 -0,2040,R1,gassupply1,2020,2.77330000000 -0,2045,R1,gassupply1,2020,2.77330000000 -0,2050,R1,gassupply1,2020,2.77330000000 -0,2059,R1,gassupply1,2020,2.77330000000 -1,2030,R1,gassupply1,2025,11.99330000000 -1,2035,R1,gassupply1,2025,11.99330000000 -1,2040,R1,gassupply1,2025,11.99330000000 -1,2045,R1,gassupply1,2025,11.99330000000 -1,2050,R1,gassupply1,2025,11.99330000000 -1,2059,R1,gassupply1,2025,11.99330000000 -1,2060,R1,gassupply1,2025,11.99330000000 -1,2064,R1,gassupply1,2025,11.99330000000 -2,2035,R1,gassupply1,2030,9.52420000000 -2,2040,R1,gassupply1,2030,9.52420000000 -2,2045,R1,gassupply1,2030,9.52420000000 -2,2050,R1,gassupply1,2030,9.52420000000 -2,2059,R1,gassupply1,2030,9.52420000000 -2,2060,R1,gassupply1,2030,9.52420000000 -2,2064,R1,gassupply1,2030,9.52420000000 -2,2065,R1,gassupply1,2030,9.52420000000 -2,2069,R1,gassupply1,2030,9.52420000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,12.17660000000 +1,2035,R1,gassupply1,2025,12.17660000000 +1,2040,R1,gassupply1,2025,12.17660000000 +1,2045,R1,gassupply1,2025,12.17660000000 +1,2050,R1,gassupply1,2025,12.17660000000 +1,2059,R1,gassupply1,2025,12.17660000000 +1,2060,R1,gassupply1,2025,12.17660000000 +1,2064,R1,gassupply1,2025,12.17660000000 +2,2035,R1,gassupply1,2030,14.17140000000 +2,2040,R1,gassupply1,2030,14.17140000000 +2,2045,R1,gassupply1,2030,14.17140000000 +2,2050,R1,gassupply1,2030,14.17140000000 +2,2059,R1,gassupply1,2030,14.17140000000 +2,2060,R1,gassupply1,2030,14.17140000000 +2,2064,R1,gassupply1,2030,14.17140000000 +2,2065,R1,gassupply1,2030,14.17140000000 +2,2069,R1,gassupply1,2030,14.17140000000 +3,2040,R1,gassupply1,2035,2.15190000000 +3,2045,R1,gassupply1,2035,2.15190000000 +3,2050,R1,gassupply1,2035,2.15190000000 +3,2059,R1,gassupply1,2035,2.15190000000 +3,2060,R1,gassupply1,2035,2.15190000000 +3,2064,R1,gassupply1,2035,2.15190000000 +3,2065,R1,gassupply1,2035,2.15190000000 +3,2069,R1,gassupply1,2035,2.15190000000 +3,2070,R1,gassupply1,2035,2.15190000000 +3,2074,R1,gassupply1,2035,2.15190000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv index f022295a9..016360220 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv @@ -1,26 +1,47 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.77330000000 -0,2030,R1,gassupply1,2020,10.27330000000 -0,2035,R1,gassupply1,2020,2.77330000000 -0,2040,R1,gassupply1,2020,2.77330000000 -0,2045,R1,gassupply1,2020,2.77330000000 -0,2050,R1,gassupply1,2020,2.77330000000 -0,2059,R1,gassupply1,2020,2.77330000000 -1,2030,R1,gassupply1,2025,11.99330000000 -1,2035,R1,gassupply1,2025,11.99330000000 -1,2040,R1,gassupply1,2025,11.99330000000 -1,2045,R1,gassupply1,2025,11.99330000000 -1,2050,R1,gassupply1,2025,11.99330000000 -1,2059,R1,gassupply1,2025,11.99330000000 -1,2060,R1,gassupply1,2025,11.99330000000 -1,2064,R1,gassupply1,2025,11.99330000000 -2,2035,R1,gassupply1,2030,9.52420000000 -2,2040,R1,gassupply1,2030,9.52420000000 -2,2045,R1,gassupply1,2030,9.52420000000 -2,2050,R1,gassupply1,2030,9.52420000000 -2,2059,R1,gassupply1,2030,9.52420000000 -2,2060,R1,gassupply1,2030,9.52420000000 -2,2064,R1,gassupply1,2030,9.52420000000 -2,2065,R1,gassupply1,2030,9.52420000000 -2,2069,R1,gassupply1,2030,9.52420000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,12.17660000000 +1,2035,R1,gassupply1,2025,12.17660000000 +1,2040,R1,gassupply1,2025,12.17660000000 +1,2045,R1,gassupply1,2025,12.17660000000 +1,2050,R1,gassupply1,2025,12.17660000000 +1,2059,R1,gassupply1,2025,12.17660000000 +1,2060,R1,gassupply1,2025,12.17660000000 +1,2064,R1,gassupply1,2025,12.17660000000 +2,2035,R1,gassupply1,2030,14.17140000000 +2,2040,R1,gassupply1,2030,14.17140000000 +2,2045,R1,gassupply1,2030,14.17140000000 +2,2050,R1,gassupply1,2030,14.17140000000 +2,2059,R1,gassupply1,2030,14.17140000000 +2,2060,R1,gassupply1,2030,14.17140000000 +2,2064,R1,gassupply1,2030,14.17140000000 +2,2065,R1,gassupply1,2030,14.17140000000 +2,2069,R1,gassupply1,2030,14.17140000000 +3,2040,R1,gassupply1,2035,2.15190000000 +3,2045,R1,gassupply1,2035,2.15190000000 +3,2050,R1,gassupply1,2035,2.15190000000 +3,2059,R1,gassupply1,2035,2.15190000000 +3,2060,R1,gassupply1,2035,2.15190000000 +3,2064,R1,gassupply1,2035,2.15190000000 +3,2065,R1,gassupply1,2035,2.15190000000 +3,2069,R1,gassupply1,2035,2.15190000000 +3,2070,R1,gassupply1,2035,2.15190000000 +3,2074,R1,gassupply1,2035,2.15190000000 +4,2045,R1,gassupply1,2040,4.00130000000 +4,2050,R1,gassupply1,2040,4.00130000000 +4,2059,R1,gassupply1,2040,4.00130000000 +4,2060,R1,gassupply1,2040,4.00130000000 +4,2064,R1,gassupply1,2040,4.00130000000 +4,2065,R1,gassupply1,2040,4.00130000000 +4,2069,R1,gassupply1,2040,4.00130000000 +4,2070,R1,gassupply1,2040,4.00130000000 +4,2074,R1,gassupply1,2040,4.00130000000 +4,2075,R1,gassupply1,2040,4.00130000000 +4,2079,R1,gassupply1,2040,4.00130000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv index f022295a9..308aa5566 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv @@ -1,26 +1,59 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.77330000000 -0,2030,R1,gassupply1,2020,10.27330000000 -0,2035,R1,gassupply1,2020,2.77330000000 -0,2040,R1,gassupply1,2020,2.77330000000 -0,2045,R1,gassupply1,2020,2.77330000000 -0,2050,R1,gassupply1,2020,2.77330000000 -0,2059,R1,gassupply1,2020,2.77330000000 -1,2030,R1,gassupply1,2025,11.99330000000 -1,2035,R1,gassupply1,2025,11.99330000000 -1,2040,R1,gassupply1,2025,11.99330000000 -1,2045,R1,gassupply1,2025,11.99330000000 -1,2050,R1,gassupply1,2025,11.99330000000 -1,2059,R1,gassupply1,2025,11.99330000000 -1,2060,R1,gassupply1,2025,11.99330000000 -1,2064,R1,gassupply1,2025,11.99330000000 -2,2035,R1,gassupply1,2030,9.52420000000 -2,2040,R1,gassupply1,2030,9.52420000000 -2,2045,R1,gassupply1,2030,9.52420000000 -2,2050,R1,gassupply1,2030,9.52420000000 -2,2059,R1,gassupply1,2030,9.52420000000 -2,2060,R1,gassupply1,2030,9.52420000000 -2,2064,R1,gassupply1,2030,9.52420000000 -2,2065,R1,gassupply1,2030,9.52420000000 -2,2069,R1,gassupply1,2030,9.52420000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,12.17660000000 +1,2035,R1,gassupply1,2025,12.17660000000 +1,2040,R1,gassupply1,2025,12.17660000000 +1,2045,R1,gassupply1,2025,12.17660000000 +1,2050,R1,gassupply1,2025,12.17660000000 +1,2059,R1,gassupply1,2025,12.17660000000 +1,2060,R1,gassupply1,2025,12.17660000000 +1,2064,R1,gassupply1,2025,12.17660000000 +2,2035,R1,gassupply1,2030,14.17140000000 +2,2040,R1,gassupply1,2030,14.17140000000 +2,2045,R1,gassupply1,2030,14.17140000000 +2,2050,R1,gassupply1,2030,14.17140000000 +2,2059,R1,gassupply1,2030,14.17140000000 +2,2060,R1,gassupply1,2030,14.17140000000 +2,2064,R1,gassupply1,2030,14.17140000000 +2,2065,R1,gassupply1,2030,14.17140000000 +2,2069,R1,gassupply1,2030,14.17140000000 +3,2040,R1,gassupply1,2035,2.15190000000 +3,2045,R1,gassupply1,2035,2.15190000000 +3,2050,R1,gassupply1,2035,2.15190000000 +3,2059,R1,gassupply1,2035,2.15190000000 +3,2060,R1,gassupply1,2035,2.15190000000 +3,2064,R1,gassupply1,2035,2.15190000000 +3,2065,R1,gassupply1,2035,2.15190000000 +3,2069,R1,gassupply1,2035,2.15190000000 +3,2070,R1,gassupply1,2035,2.15190000000 +3,2074,R1,gassupply1,2035,2.15190000000 +4,2045,R1,gassupply1,2040,4.00130000000 +4,2050,R1,gassupply1,2040,4.00130000000 +4,2059,R1,gassupply1,2040,4.00130000000 +4,2060,R1,gassupply1,2040,4.00130000000 +4,2064,R1,gassupply1,2040,4.00130000000 +4,2065,R1,gassupply1,2040,4.00130000000 +4,2069,R1,gassupply1,2040,4.00130000000 +4,2070,R1,gassupply1,2040,4.00130000000 +4,2074,R1,gassupply1,2040,4.00130000000 +4,2075,R1,gassupply1,2040,4.00130000000 +4,2079,R1,gassupply1,2040,4.00130000000 +5,2050,R1,gassupply1,2045,3.79120000000 +5,2059,R1,gassupply1,2045,3.79120000000 +5,2060,R1,gassupply1,2045,3.79120000000 +5,2064,R1,gassupply1,2045,3.79120000000 +5,2065,R1,gassupply1,2045,3.79120000000 +5,2069,R1,gassupply1,2045,3.79120000000 +5,2070,R1,gassupply1,2045,3.79120000000 +5,2074,R1,gassupply1,2045,3.79120000000 +5,2075,R1,gassupply1,2045,3.79120000000 +5,2079,R1,gassupply1,2045,3.79120000000 +5,2080,R1,gassupply1,2045,3.79120000000 +5,2084,R1,gassupply1,2045,3.79120000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv index f022295a9..29c2adbbb 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv @@ -1,26 +1,79 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.77330000000 -0,2030,R1,gassupply1,2020,10.27330000000 -0,2035,R1,gassupply1,2020,2.77330000000 -0,2040,R1,gassupply1,2020,2.77330000000 -0,2045,R1,gassupply1,2020,2.77330000000 -0,2050,R1,gassupply1,2020,2.77330000000 -0,2059,R1,gassupply1,2020,2.77330000000 -1,2030,R1,gassupply1,2025,11.99330000000 -1,2035,R1,gassupply1,2025,11.99330000000 -1,2040,R1,gassupply1,2025,11.99330000000 -1,2045,R1,gassupply1,2025,11.99330000000 -1,2050,R1,gassupply1,2025,11.99330000000 -1,2059,R1,gassupply1,2025,11.99330000000 -1,2060,R1,gassupply1,2025,11.99330000000 -1,2064,R1,gassupply1,2025,11.99330000000 -2,2035,R1,gassupply1,2030,9.52420000000 -2,2040,R1,gassupply1,2030,9.52420000000 -2,2045,R1,gassupply1,2030,9.52420000000 -2,2050,R1,gassupply1,2030,9.52420000000 -2,2059,R1,gassupply1,2030,9.52420000000 -2,2060,R1,gassupply1,2030,9.52420000000 -2,2064,R1,gassupply1,2030,9.52420000000 -2,2065,R1,gassupply1,2030,9.52420000000 -2,2069,R1,gassupply1,2030,9.52420000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2055,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,12.17660000000 +1,2035,R1,gassupply1,2025,12.17660000000 +1,2040,R1,gassupply1,2025,12.17660000000 +1,2045,R1,gassupply1,2025,12.17660000000 +1,2050,R1,gassupply1,2025,12.17660000000 +1,2055,R1,gassupply1,2025,12.17660000000 +1,2059,R1,gassupply1,2025,12.17660000000 +1,2060,R1,gassupply1,2025,12.17660000000 +1,2064,R1,gassupply1,2025,12.17660000000 +2,2035,R1,gassupply1,2030,14.17140000000 +2,2040,R1,gassupply1,2030,14.17140000000 +2,2045,R1,gassupply1,2030,14.17140000000 +2,2050,R1,gassupply1,2030,14.17140000000 +2,2055,R1,gassupply1,2030,14.17140000000 +2,2059,R1,gassupply1,2030,14.17140000000 +2,2060,R1,gassupply1,2030,14.17140000000 +2,2064,R1,gassupply1,2030,14.17140000000 +2,2065,R1,gassupply1,2030,14.17140000000 +2,2069,R1,gassupply1,2030,14.17140000000 +3,2040,R1,gassupply1,2035,2.15190000000 +3,2045,R1,gassupply1,2035,2.15190000000 +3,2050,R1,gassupply1,2035,2.15190000000 +3,2055,R1,gassupply1,2035,2.15190000000 +3,2059,R1,gassupply1,2035,2.15190000000 +3,2060,R1,gassupply1,2035,2.15190000000 +3,2064,R1,gassupply1,2035,2.15190000000 +3,2065,R1,gassupply1,2035,2.15190000000 +3,2069,R1,gassupply1,2035,2.15190000000 +3,2070,R1,gassupply1,2035,2.15190000000 +3,2074,R1,gassupply1,2035,2.15190000000 +4,2045,R1,gassupply1,2040,4.00130000000 +4,2050,R1,gassupply1,2040,4.00130000000 +4,2055,R1,gassupply1,2040,4.00130000000 +4,2059,R1,gassupply1,2040,4.00130000000 +4,2060,R1,gassupply1,2040,4.00130000000 +4,2064,R1,gassupply1,2040,4.00130000000 +4,2065,R1,gassupply1,2040,4.00130000000 +4,2069,R1,gassupply1,2040,4.00130000000 +4,2070,R1,gassupply1,2040,4.00130000000 +4,2074,R1,gassupply1,2040,4.00130000000 +4,2075,R1,gassupply1,2040,4.00130000000 +4,2079,R1,gassupply1,2040,4.00130000000 +5,2050,R1,gassupply1,2045,3.79120000000 +5,2055,R1,gassupply1,2045,3.79120000000 +5,2059,R1,gassupply1,2045,3.79120000000 +5,2060,R1,gassupply1,2045,3.79120000000 +5,2064,R1,gassupply1,2045,3.79120000000 +5,2065,R1,gassupply1,2045,3.79120000000 +5,2069,R1,gassupply1,2045,3.79120000000 +5,2070,R1,gassupply1,2045,3.79120000000 +5,2074,R1,gassupply1,2045,3.79120000000 +5,2075,R1,gassupply1,2045,3.79120000000 +5,2079,R1,gassupply1,2045,3.79120000000 +5,2080,R1,gassupply1,2045,3.79120000000 +5,2084,R1,gassupply1,2045,3.79120000000 +6,2055,R1,gassupply1,2050,0.47320000000 +6,2059,R1,gassupply1,2050,0.47320000000 +6,2060,R1,gassupply1,2050,0.47320000000 +6,2064,R1,gassupply1,2050,0.47320000000 +6,2065,R1,gassupply1,2050,0.47320000000 +6,2069,R1,gassupply1,2050,0.47320000000 +6,2070,R1,gassupply1,2050,0.47320000000 +6,2074,R1,gassupply1,2050,0.47320000000 +6,2075,R1,gassupply1,2050,0.47320000000 +6,2079,R1,gassupply1,2050,0.47320000000 +6,2080,R1,gassupply1,2050,0.47320000000 +6,2084,R1,gassupply1,2050,0.47320000000 +6,2085,R1,gassupply1,2050,0.47320000000 +6,2089,R1,gassupply1,2050,0.47320000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv index efe1d9800..800b4944a 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv @@ -7,97 +7,113 @@ A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,2.36110000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A2,2.36110000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,8.88670000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,8.88670000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A2,2.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,1.52780000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,9.19390000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,9.19390000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,5.13670000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,5.13670000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,7.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A2,2.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2030 +A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 +A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,0.12500000000,R1,2030,R1,power,solarPV,newcapa,2035 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2035 +A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2035 +A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 +A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,0.12500000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,0.62500000000,R1,2035,R1,power,solarPV,newcapa,2040 +A1,0.18750000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2040 +A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2040 +A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A2,0.81250000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 -A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 -A1,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 -A2,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 +A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.12500000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,0.62500000000,R1,2035,R1,power,solarPV,newcapa,2045 +A1,1.75000000000,R1,2040,R1,power,solarPV,newcapa,2045 +A1,0.18750000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2045 +A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2045 +A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A2,0.81250000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,2.00060000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,2.00060000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 -A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 -A1,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 -A2,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A2,3.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050 +A2,11.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.12500000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,0.62500000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,1.75000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,1.50000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,0.18750000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2050 +A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,0.81250000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,3.53130000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,2.00060000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.89560000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,2.00060000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.89560000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv index 68d19067d..7d98d75d3 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,12.25210000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.69150000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,5.82450000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,6.16680000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,12.25210000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.69150000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,5.82450000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,6.16680000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,12.25210000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.69150000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,5.82450000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,6.16680000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,12.25210000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.69150000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,5.82450000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,6.16680000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.25210000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.69150000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.82450000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,6.16680000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,12.25210000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.69150000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,5.82450000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,6.16680000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,15.63730000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,8.65200000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.49540000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.78180000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,15.63730000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,8.65200000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.49540000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.78180000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,15.63730000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,8.65200000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.49540000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.78180000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,15.63730000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,8.65200000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.49540000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.78180000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,15.63730000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,8.65200000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.49540000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.78180000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,15.63730000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,8.65200000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.49540000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.78180000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,19.18520000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.09640000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,7.91460000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.61730000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.18520000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,11.09640000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,7.91460000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.61730000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,19.18520000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.09640000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,7.91460000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.61730000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.18520000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,11.09640000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,7.91460000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.61730000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,19.18520000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.09640000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,7.91460000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.61730000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,19.18520000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,11.09640000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.91460000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.61730000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,20.54460000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,12.65780000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.45830000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,11.80230000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,20.54460000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.65780000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.45830000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.80230000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,20.54460000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,12.65780000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.45830000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,11.80230000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,20.54460000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.65780000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.45830000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.80230000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,20.54460000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,12.65780000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,8.45830000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.80230000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,20.54460000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,12.65780000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.45830000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,11.80230000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,22.95080000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,13.87290000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,9.42080000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,14.67220000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,22.95080000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.87290000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.42080000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,14.67220000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,22.95080000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,13.87290000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,9.42080000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,14.67220000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,22.95080000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.87290000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.42080000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,14.67220000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,22.95080000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,13.87290000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,9.42080000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,14.67220000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,22.95080000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.87290000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,9.42080000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,14.67220000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,24.79080000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,15.06010000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,10.15680000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,17.53660000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,24.79080000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,15.06010000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.15680000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,17.53660000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,24.79080000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,15.06010000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,10.15680000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,17.53660000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,24.79080000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,15.06010000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.15680000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,17.53660000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,24.79080000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,15.06010000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,10.15680000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,17.53660000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,24.79080000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.06010000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.15680000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,17.53660000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv index e66df0850..e46424887 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv @@ -1,9 +1,16 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,4.72220000000 -0,2030,R1,gasCCGT,2020,3.72220000000 -0,2035,R1,gasCCGT,2020,3.72220000000 -0,2040,R1,gasCCGT,2020,3.72220000000 -0,2045,R1,gasCCGT,2020,3.72220000000 -0,2050,R1,gasCCGT,2020,3.72220000000 -0,2059,R1,gasCCGT,2020,3.72220000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2025,R1,windturbine,2020,2.31250000000 +1,2030,R1,windturbine,2020,2.31250000000 +1,2035,R1,windturbine,2020,2.31250000000 +1,2040,R1,windturbine,2020,2.31250000000 +1,2045,R1,windturbine,2020,2.31250000000 +1,2049,R1,windturbine,2020,2.31250000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv index ab71e6e2c..f86c25e29 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv @@ -1,17 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,4.72220000000 -0,2030,R1,gasCCGT,2020,3.72220000000 -0,2035,R1,gasCCGT,2020,3.72220000000 -0,2040,R1,gasCCGT,2020,3.72220000000 -0,2045,R1,gasCCGT,2020,3.72220000000 -0,2050,R1,gasCCGT,2020,3.72220000000 -0,2059,R1,gasCCGT,2020,3.72220000000 -1,2030,R1,gasCCGT,2025,9.61110000000 -1,2035,R1,gasCCGT,2025,9.61110000000 -1,2040,R1,gasCCGT,2025,9.61110000000 -1,2045,R1,gasCCGT,2025,9.61110000000 -1,2050,R1,gasCCGT,2025,9.61110000000 -1,2059,R1,gasCCGT,2025,9.61110000000 -1,2060,R1,gasCCGT,2025,9.61110000000 -1,2064,R1,gasCCGT,2025,9.61110000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,2.75000000000 +1,2035,R1,gasCCGT,2025,2.75000000000 +1,2040,R1,gasCCGT,2025,2.75000000000 +1,2045,R1,gasCCGT,2025,2.75000000000 +1,2049,R1,gasCCGT,2025,2.75000000000 +1,2050,R1,gasCCGT,2025,2.75000000000 +1,2054,R1,gasCCGT,2025,2.75000000000 +1,2055,R1,gasCCGT,2025,2.75000000000 +1,2059,R1,gasCCGT,2025,2.75000000000 +1,2060,R1,gasCCGT,2025,2.75000000000 +1,2064,R1,gasCCGT,2025,2.75000000000 +2,2025,R1,windturbine,2020,2.31250000000 +2,2030,R1,windturbine,2020,2.31250000000 +2,2035,R1,windturbine,2020,2.31250000000 +2,2040,R1,windturbine,2020,2.31250000000 +2,2045,R1,windturbine,2020,2.31250000000 +2,2049,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2025,6.18750000000 +3,2035,R1,windturbine,2025,6.18750000000 +3,2040,R1,windturbine,2025,6.18750000000 +3,2045,R1,windturbine,2025,6.18750000000 +3,2049,R1,windturbine,2025,6.18750000000 +3,2050,R1,windturbine,2025,6.18750000000 +3,2054,R1,windturbine,2025,6.18750000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv index e417cf58d..9a6408950 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv @@ -1,22 +1,52 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,4.72220000000 -0,2030,R1,gasCCGT,2020,3.72220000000 -0,2035,R1,gasCCGT,2020,3.72220000000 -0,2040,R1,gasCCGT,2020,3.72220000000 -0,2045,R1,gasCCGT,2020,3.72220000000 -0,2050,R1,gasCCGT,2020,3.72220000000 -0,2059,R1,gasCCGT,2020,3.72220000000 -1,2030,R1,gasCCGT,2025,9.61110000000 -1,2035,R1,gasCCGT,2025,9.61110000000 -1,2040,R1,gasCCGT,2025,9.61110000000 -1,2045,R1,gasCCGT,2025,9.61110000000 -1,2050,R1,gasCCGT,2025,9.61110000000 -1,2059,R1,gasCCGT,2025,9.61110000000 -1,2060,R1,gasCCGT,2025,9.61110000000 -1,2064,R1,gasCCGT,2025,9.61110000000 -2,2035,R1,solarPV,2030,3.00000000000 -2,2040,R1,solarPV,2030,3.00000000000 -2,2045,R1,solarPV,2030,3.00000000000 -2,2050,R1,solarPV,2030,3.00000000000 -2,2059,R1,solarPV,2030,3.00000000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,2.75000000000 +1,2035,R1,gasCCGT,2025,2.75000000000 +1,2040,R1,gasCCGT,2025,2.75000000000 +1,2045,R1,gasCCGT,2025,2.75000000000 +1,2049,R1,gasCCGT,2025,2.75000000000 +1,2050,R1,gasCCGT,2025,2.75000000000 +1,2054,R1,gasCCGT,2025,2.75000000000 +1,2055,R1,gasCCGT,2025,2.75000000000 +1,2059,R1,gasCCGT,2025,2.75000000000 +1,2060,R1,gasCCGT,2025,2.75000000000 +1,2064,R1,gasCCGT,2025,2.75000000000 +2,2035,R1,solarPV,2030,0.12500000000 +2,2040,R1,solarPV,2030,0.12500000000 +2,2045,R1,solarPV,2030,0.12500000000 +2,2049,R1,solarPV,2030,0.12500000000 +2,2050,R1,solarPV,2030,0.12500000000 +2,2054,R1,solarPV,2030,0.12500000000 +2,2055,R1,solarPV,2030,0.12500000000 +2,2059,R1,solarPV,2030,0.12500000000 +3,2025,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2020,2.31250000000 +3,2035,R1,windturbine,2020,2.31250000000 +3,2040,R1,windturbine,2020,2.31250000000 +3,2045,R1,windturbine,2020,2.31250000000 +3,2049,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2025,6.18750000000 +4,2035,R1,windturbine,2025,6.18750000000 +4,2040,R1,windturbine,2025,6.18750000000 +4,2045,R1,windturbine,2025,6.18750000000 +4,2049,R1,windturbine,2025,6.18750000000 +4,2050,R1,windturbine,2025,6.18750000000 +4,2054,R1,windturbine,2025,6.18750000000 +5,2035,R1,windturbine,2030,0.25000000000 +5,2040,R1,windturbine,2030,0.25000000000 +5,2045,R1,windturbine,2030,0.25000000000 +5,2049,R1,windturbine,2030,0.25000000000 +5,2050,R1,windturbine,2030,0.25000000000 +5,2054,R1,windturbine,2030,0.25000000000 +5,2055,R1,windturbine,2030,0.25000000000 +5,2059,R1,windturbine,2030,0.25000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv index d28669d13..a8439422a 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv @@ -1,28 +1,70 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,4.72220000000 -0,2030,R1,gasCCGT,2020,3.72220000000 -0,2035,R1,gasCCGT,2020,3.72220000000 -0,2040,R1,gasCCGT,2020,3.72220000000 -0,2045,R1,gasCCGT,2020,3.72220000000 -0,2050,R1,gasCCGT,2020,3.72220000000 -0,2059,R1,gasCCGT,2020,3.72220000000 -1,2030,R1,gasCCGT,2025,9.61110000000 -1,2035,R1,gasCCGT,2025,9.61110000000 -1,2040,R1,gasCCGT,2025,9.61110000000 -1,2045,R1,gasCCGT,2025,9.61110000000 -1,2050,R1,gasCCGT,2025,9.61110000000 -1,2059,R1,gasCCGT,2025,9.61110000000 -1,2060,R1,gasCCGT,2025,9.61110000000 -1,2064,R1,gasCCGT,2025,9.61110000000 -2,2035,R1,solarPV,2030,3.00000000000 -2,2040,R1,solarPV,2030,3.00000000000 -2,2045,R1,solarPV,2030,3.00000000000 -2,2050,R1,solarPV,2030,3.00000000000 -2,2059,R1,solarPV,2030,3.00000000000 -3,2040,R1,solarPV,2035,6.00000000000 -3,2045,R1,solarPV,2035,6.00000000000 -3,2050,R1,solarPV,2035,6.00000000000 -3,2059,R1,solarPV,2035,6.00000000000 -3,2060,R1,solarPV,2035,6.00000000000 -3,2064,R1,solarPV,2035,6.00000000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,2.75000000000 +1,2035,R1,gasCCGT,2025,2.75000000000 +1,2040,R1,gasCCGT,2025,2.75000000000 +1,2045,R1,gasCCGT,2025,2.75000000000 +1,2049,R1,gasCCGT,2025,2.75000000000 +1,2050,R1,gasCCGT,2025,2.75000000000 +1,2054,R1,gasCCGT,2025,2.75000000000 +1,2055,R1,gasCCGT,2025,2.75000000000 +1,2059,R1,gasCCGT,2025,2.75000000000 +1,2060,R1,gasCCGT,2025,2.75000000000 +1,2064,R1,gasCCGT,2025,2.75000000000 +2,2035,R1,solarPV,2030,0.12500000000 +2,2040,R1,solarPV,2030,0.12500000000 +2,2045,R1,solarPV,2030,0.12500000000 +2,2049,R1,solarPV,2030,0.12500000000 +2,2050,R1,solarPV,2030,0.12500000000 +2,2054,R1,solarPV,2030,0.12500000000 +2,2055,R1,solarPV,2030,0.12500000000 +2,2059,R1,solarPV,2030,0.12500000000 +3,2040,R1,solarPV,2035,0.62500000000 +3,2045,R1,solarPV,2035,0.62500000000 +3,2049,R1,solarPV,2035,0.62500000000 +3,2050,R1,solarPV,2035,0.62500000000 +3,2054,R1,solarPV,2035,0.62500000000 +3,2055,R1,solarPV,2035,0.62500000000 +3,2059,R1,solarPV,2035,0.62500000000 +3,2060,R1,solarPV,2035,0.62500000000 +3,2064,R1,solarPV,2035,0.62500000000 +4,2025,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2020,2.31250000000 +4,2035,R1,windturbine,2020,2.31250000000 +4,2040,R1,windturbine,2020,2.31250000000 +4,2045,R1,windturbine,2020,2.31250000000 +4,2049,R1,windturbine,2020,2.31250000000 +5,2030,R1,windturbine,2025,6.18750000000 +5,2035,R1,windturbine,2025,6.18750000000 +5,2040,R1,windturbine,2025,6.18750000000 +5,2045,R1,windturbine,2025,6.18750000000 +5,2049,R1,windturbine,2025,6.18750000000 +5,2050,R1,windturbine,2025,6.18750000000 +5,2054,R1,windturbine,2025,6.18750000000 +6,2035,R1,windturbine,2030,0.25000000000 +6,2040,R1,windturbine,2030,0.25000000000 +6,2045,R1,windturbine,2030,0.25000000000 +6,2049,R1,windturbine,2030,0.25000000000 +6,2050,R1,windturbine,2030,0.25000000000 +6,2054,R1,windturbine,2030,0.25000000000 +6,2055,R1,windturbine,2030,0.25000000000 +6,2059,R1,windturbine,2030,0.25000000000 +7,2040,R1,windturbine,2035,1.00000000000 +7,2045,R1,windturbine,2035,1.00000000000 +7,2049,R1,windturbine,2035,1.00000000000 +7,2050,R1,windturbine,2035,1.00000000000 +7,2054,R1,windturbine,2035,1.00000000000 +7,2055,R1,windturbine,2035,1.00000000000 +7,2059,R1,windturbine,2035,1.00000000000 +7,2060,R1,windturbine,2035,1.00000000000 +7,2064,R1,windturbine,2035,1.00000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv index f987efb5c..d25518a14 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv @@ -1,35 +1,90 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,4.72220000000 -0,2030,R1,gasCCGT,2020,3.72220000000 -0,2035,R1,gasCCGT,2020,3.72220000000 -0,2040,R1,gasCCGT,2020,3.72220000000 -0,2045,R1,gasCCGT,2020,3.72220000000 -0,2050,R1,gasCCGT,2020,3.72220000000 -0,2059,R1,gasCCGT,2020,3.72220000000 -1,2030,R1,gasCCGT,2025,9.61110000000 -1,2035,R1,gasCCGT,2025,9.61110000000 -1,2040,R1,gasCCGT,2025,9.61110000000 -1,2045,R1,gasCCGT,2025,9.61110000000 -1,2050,R1,gasCCGT,2025,9.61110000000 -1,2059,R1,gasCCGT,2025,9.61110000000 -1,2060,R1,gasCCGT,2025,9.61110000000 -1,2064,R1,gasCCGT,2025,9.61110000000 -2,2035,R1,solarPV,2030,3.00000000000 -2,2040,R1,solarPV,2030,3.00000000000 -2,2045,R1,solarPV,2030,3.00000000000 -2,2050,R1,solarPV,2030,3.00000000000 -2,2059,R1,solarPV,2030,3.00000000000 -3,2040,R1,solarPV,2035,6.00000000000 -3,2045,R1,solarPV,2035,6.00000000000 -3,2050,R1,solarPV,2035,6.00000000000 -3,2059,R1,solarPV,2035,6.00000000000 -3,2060,R1,solarPV,2035,6.00000000000 -3,2064,R1,solarPV,2035,6.00000000000 -4,2045,R1,solarPV,2040,6.00000000000 -4,2050,R1,solarPV,2040,6.00000000000 -4,2059,R1,solarPV,2040,6.00000000000 -4,2060,R1,solarPV,2040,6.00000000000 -4,2064,R1,solarPV,2040,6.00000000000 -4,2065,R1,solarPV,2040,6.00000000000 -4,2069,R1,solarPV,2040,6.00000000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,2.75000000000 +1,2035,R1,gasCCGT,2025,2.75000000000 +1,2040,R1,gasCCGT,2025,2.75000000000 +1,2045,R1,gasCCGT,2025,2.75000000000 +1,2049,R1,gasCCGT,2025,2.75000000000 +1,2050,R1,gasCCGT,2025,2.75000000000 +1,2054,R1,gasCCGT,2025,2.75000000000 +1,2055,R1,gasCCGT,2025,2.75000000000 +1,2059,R1,gasCCGT,2025,2.75000000000 +1,2060,R1,gasCCGT,2025,2.75000000000 +1,2064,R1,gasCCGT,2025,2.75000000000 +2,2035,R1,solarPV,2030,0.12500000000 +2,2040,R1,solarPV,2030,0.12500000000 +2,2045,R1,solarPV,2030,0.12500000000 +2,2049,R1,solarPV,2030,0.12500000000 +2,2050,R1,solarPV,2030,0.12500000000 +2,2054,R1,solarPV,2030,0.12500000000 +2,2055,R1,solarPV,2030,0.12500000000 +2,2059,R1,solarPV,2030,0.12500000000 +3,2040,R1,solarPV,2035,0.62500000000 +3,2045,R1,solarPV,2035,0.62500000000 +3,2049,R1,solarPV,2035,0.62500000000 +3,2050,R1,solarPV,2035,0.62500000000 +3,2054,R1,solarPV,2035,0.62500000000 +3,2055,R1,solarPV,2035,0.62500000000 +3,2059,R1,solarPV,2035,0.62500000000 +3,2060,R1,solarPV,2035,0.62500000000 +3,2064,R1,solarPV,2035,0.62500000000 +4,2045,R1,solarPV,2040,1.75000000000 +4,2049,R1,solarPV,2040,1.75000000000 +4,2050,R1,solarPV,2040,1.75000000000 +4,2054,R1,solarPV,2040,1.75000000000 +4,2055,R1,solarPV,2040,1.75000000000 +4,2059,R1,solarPV,2040,1.75000000000 +4,2060,R1,solarPV,2040,1.75000000000 +4,2064,R1,solarPV,2040,1.75000000000 +4,2065,R1,solarPV,2040,1.75000000000 +4,2069,R1,solarPV,2040,1.75000000000 +5,2025,R1,windturbine,2020,2.31250000000 +5,2030,R1,windturbine,2020,2.31250000000 +5,2035,R1,windturbine,2020,2.31250000000 +5,2040,R1,windturbine,2020,2.31250000000 +5,2045,R1,windturbine,2020,2.31250000000 +5,2049,R1,windturbine,2020,2.31250000000 +6,2030,R1,windturbine,2025,6.18750000000 +6,2035,R1,windturbine,2025,6.18750000000 +6,2040,R1,windturbine,2025,6.18750000000 +6,2045,R1,windturbine,2025,6.18750000000 +6,2049,R1,windturbine,2025,6.18750000000 +6,2050,R1,windturbine,2025,6.18750000000 +6,2054,R1,windturbine,2025,6.18750000000 +7,2035,R1,windturbine,2030,0.25000000000 +7,2040,R1,windturbine,2030,0.25000000000 +7,2045,R1,windturbine,2030,0.25000000000 +7,2049,R1,windturbine,2030,0.25000000000 +7,2050,R1,windturbine,2030,0.25000000000 +7,2054,R1,windturbine,2030,0.25000000000 +7,2055,R1,windturbine,2030,0.25000000000 +7,2059,R1,windturbine,2030,0.25000000000 +8,2040,R1,windturbine,2035,1.00000000000 +8,2045,R1,windturbine,2035,1.00000000000 +8,2049,R1,windturbine,2035,1.00000000000 +8,2050,R1,windturbine,2035,1.00000000000 +8,2054,R1,windturbine,2035,1.00000000000 +8,2055,R1,windturbine,2035,1.00000000000 +8,2059,R1,windturbine,2035,1.00000000000 +8,2060,R1,windturbine,2035,1.00000000000 +8,2064,R1,windturbine,2035,1.00000000000 +9,2045,R1,windturbine,2040,1.50000000000 +9,2049,R1,windturbine,2040,1.50000000000 +9,2050,R1,windturbine,2040,1.50000000000 +9,2054,R1,windturbine,2040,1.50000000000 +9,2055,R1,windturbine,2040,1.50000000000 +9,2059,R1,windturbine,2040,1.50000000000 +9,2060,R1,windturbine,2040,1.50000000000 +9,2064,R1,windturbine,2040,1.50000000000 +9,2065,R1,windturbine,2040,1.50000000000 +9,2069,R1,windturbine,2040,1.50000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv index e95d3ea32..dfede315c 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv @@ -1,43 +1,111 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,4.72220000000 -0,2030,R1,gasCCGT,2020,3.72220000000 -0,2035,R1,gasCCGT,2020,3.72220000000 -0,2040,R1,gasCCGT,2020,3.72220000000 -0,2045,R1,gasCCGT,2020,3.72220000000 -0,2050,R1,gasCCGT,2020,3.72220000000 -0,2059,R1,gasCCGT,2020,3.72220000000 -1,2030,R1,gasCCGT,2025,9.61110000000 -1,2035,R1,gasCCGT,2025,9.61110000000 -1,2040,R1,gasCCGT,2025,9.61110000000 -1,2045,R1,gasCCGT,2025,9.61110000000 -1,2050,R1,gasCCGT,2025,9.61110000000 -1,2059,R1,gasCCGT,2025,9.61110000000 -1,2060,R1,gasCCGT,2025,9.61110000000 -1,2064,R1,gasCCGT,2025,9.61110000000 -2,2035,R1,solarPV,2030,3.00000000000 -2,2040,R1,solarPV,2030,3.00000000000 -2,2045,R1,solarPV,2030,3.00000000000 -2,2050,R1,solarPV,2030,3.00000000000 -2,2059,R1,solarPV,2030,3.00000000000 -3,2040,R1,solarPV,2035,6.00000000000 -3,2045,R1,solarPV,2035,6.00000000000 -3,2050,R1,solarPV,2035,6.00000000000 -3,2059,R1,solarPV,2035,6.00000000000 -3,2060,R1,solarPV,2035,6.00000000000 -3,2064,R1,solarPV,2035,6.00000000000 -4,2045,R1,solarPV,2040,6.00000000000 -4,2050,R1,solarPV,2040,6.00000000000 -4,2059,R1,solarPV,2040,6.00000000000 -4,2060,R1,solarPV,2040,6.00000000000 -4,2064,R1,solarPV,2040,6.00000000000 -4,2065,R1,solarPV,2040,6.00000000000 -4,2069,R1,solarPV,2040,6.00000000000 -5,2050,R1,solarPV,2045,6.00000000000 -5,2059,R1,solarPV,2045,6.00000000000 -5,2060,R1,solarPV,2045,6.00000000000 -5,2064,R1,solarPV,2045,6.00000000000 -5,2065,R1,solarPV,2045,6.00000000000 -5,2069,R1,solarPV,2045,6.00000000000 -5,2070,R1,solarPV,2045,6.00000000000 -5,2074,R1,solarPV,2045,6.00000000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,2.75000000000 +1,2035,R1,gasCCGT,2025,2.75000000000 +1,2040,R1,gasCCGT,2025,2.75000000000 +1,2045,R1,gasCCGT,2025,2.75000000000 +1,2049,R1,gasCCGT,2025,2.75000000000 +1,2050,R1,gasCCGT,2025,2.75000000000 +1,2054,R1,gasCCGT,2025,2.75000000000 +1,2055,R1,gasCCGT,2025,2.75000000000 +1,2059,R1,gasCCGT,2025,2.75000000000 +1,2060,R1,gasCCGT,2025,2.75000000000 +1,2064,R1,gasCCGT,2025,2.75000000000 +2,2035,R1,solarPV,2030,0.12500000000 +2,2040,R1,solarPV,2030,0.12500000000 +2,2045,R1,solarPV,2030,0.12500000000 +2,2049,R1,solarPV,2030,0.12500000000 +2,2050,R1,solarPV,2030,0.12500000000 +2,2054,R1,solarPV,2030,0.12500000000 +2,2055,R1,solarPV,2030,0.12500000000 +2,2059,R1,solarPV,2030,0.12500000000 +3,2040,R1,solarPV,2035,0.62500000000 +3,2045,R1,solarPV,2035,0.62500000000 +3,2049,R1,solarPV,2035,0.62500000000 +3,2050,R1,solarPV,2035,0.62500000000 +3,2054,R1,solarPV,2035,0.62500000000 +3,2055,R1,solarPV,2035,0.62500000000 +3,2059,R1,solarPV,2035,0.62500000000 +3,2060,R1,solarPV,2035,0.62500000000 +3,2064,R1,solarPV,2035,0.62500000000 +4,2045,R1,solarPV,2040,1.75000000000 +4,2049,R1,solarPV,2040,1.75000000000 +4,2050,R1,solarPV,2040,1.75000000000 +4,2054,R1,solarPV,2040,1.75000000000 +4,2055,R1,solarPV,2040,1.75000000000 +4,2059,R1,solarPV,2040,1.75000000000 +4,2060,R1,solarPV,2040,1.75000000000 +4,2064,R1,solarPV,2040,1.75000000000 +4,2065,R1,solarPV,2040,1.75000000000 +4,2069,R1,solarPV,2040,1.75000000000 +5,2049,R1,solarPV,2045,1.20000000000 +5,2050,R1,solarPV,2045,1.50000000000 +5,2054,R1,solarPV,2045,1.50000000000 +5,2055,R1,solarPV,2045,1.50000000000 +5,2059,R1,solarPV,2045,1.50000000000 +5,2060,R1,solarPV,2045,1.50000000000 +5,2064,R1,solarPV,2045,1.50000000000 +5,2065,R1,solarPV,2045,1.50000000000 +5,2069,R1,solarPV,2045,1.50000000000 +5,2070,R1,solarPV,2045,1.50000000000 +5,2074,R1,solarPV,2045,1.50000000000 +6,2025,R1,windturbine,2020,2.31250000000 +6,2030,R1,windturbine,2020,2.31250000000 +6,2035,R1,windturbine,2020,2.31250000000 +6,2040,R1,windturbine,2020,2.31250000000 +6,2045,R1,windturbine,2020,2.31250000000 +6,2049,R1,windturbine,2020,2.31250000000 +7,2030,R1,windturbine,2025,6.18750000000 +7,2035,R1,windturbine,2025,6.18750000000 +7,2040,R1,windturbine,2025,6.18750000000 +7,2045,R1,windturbine,2025,6.18750000000 +7,2049,R1,windturbine,2025,6.18750000000 +7,2050,R1,windturbine,2025,6.18750000000 +7,2054,R1,windturbine,2025,6.18750000000 +8,2035,R1,windturbine,2030,0.25000000000 +8,2040,R1,windturbine,2030,0.25000000000 +8,2045,R1,windturbine,2030,0.25000000000 +8,2049,R1,windturbine,2030,0.25000000000 +8,2050,R1,windturbine,2030,0.25000000000 +8,2054,R1,windturbine,2030,0.25000000000 +8,2055,R1,windturbine,2030,0.25000000000 +8,2059,R1,windturbine,2030,0.25000000000 +9,2040,R1,windturbine,2035,1.00000000000 +9,2045,R1,windturbine,2035,1.00000000000 +9,2049,R1,windturbine,2035,1.00000000000 +9,2050,R1,windturbine,2035,1.00000000000 +9,2054,R1,windturbine,2035,1.00000000000 +9,2055,R1,windturbine,2035,1.00000000000 +9,2059,R1,windturbine,2035,1.00000000000 +9,2060,R1,windturbine,2035,1.00000000000 +9,2064,R1,windturbine,2035,1.00000000000 +10,2045,R1,windturbine,2040,1.50000000000 +10,2049,R1,windturbine,2040,1.50000000000 +10,2050,R1,windturbine,2040,1.50000000000 +10,2054,R1,windturbine,2040,1.50000000000 +10,2055,R1,windturbine,2040,1.50000000000 +10,2059,R1,windturbine,2040,1.50000000000 +10,2060,R1,windturbine,2040,1.50000000000 +10,2064,R1,windturbine,2040,1.50000000000 +10,2065,R1,windturbine,2040,1.50000000000 +10,2069,R1,windturbine,2040,1.50000000000 +11,2050,R1,windturbine,2045,3.53130000000 +11,2054,R1,windturbine,2045,3.53130000000 +11,2055,R1,windturbine,2045,3.53130000000 +11,2059,R1,windturbine,2045,3.53130000000 +11,2060,R1,windturbine,2045,3.53130000000 +11,2064,R1,windturbine,2045,3.53130000000 +11,2065,R1,windturbine,2045,3.53130000000 +11,2069,R1,windturbine,2045,3.53130000000 +11,2070,R1,windturbine,2045,3.53130000000 +11,2074,R1,windturbine,2045,3.53130000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv index f8d940eed..1678ee949 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv @@ -1,59 +1,131 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,4.72220000000 -0,2030,R1,gasCCGT,2020,3.72220000000 -0,2035,R1,gasCCGT,2020,3.72220000000 -0,2040,R1,gasCCGT,2020,3.72220000000 -0,2045,R1,gasCCGT,2020,3.72220000000 -0,2050,R1,gasCCGT,2020,3.72220000000 -0,2055,R1,gasCCGT,2020,3.72220000000 -0,2059,R1,gasCCGT,2020,3.72220000000 -1,2030,R1,gasCCGT,2025,9.61110000000 -1,2035,R1,gasCCGT,2025,9.61110000000 -1,2040,R1,gasCCGT,2025,9.61110000000 -1,2045,R1,gasCCGT,2025,9.61110000000 -1,2050,R1,gasCCGT,2025,9.61110000000 -1,2055,R1,gasCCGT,2025,9.61110000000 -1,2059,R1,gasCCGT,2025,9.61110000000 -1,2060,R1,gasCCGT,2025,9.61110000000 -1,2064,R1,gasCCGT,2025,9.61110000000 -2,2035,R1,solarPV,2030,3.00000000000 -2,2040,R1,solarPV,2030,3.00000000000 -2,2045,R1,solarPV,2030,3.00000000000 -2,2050,R1,solarPV,2030,3.00000000000 -2,2055,R1,solarPV,2030,3.00000000000 -2,2059,R1,solarPV,2030,3.00000000000 -3,2040,R1,solarPV,2035,6.00000000000 -3,2045,R1,solarPV,2035,6.00000000000 -3,2050,R1,solarPV,2035,6.00000000000 -3,2055,R1,solarPV,2035,6.00000000000 -3,2059,R1,solarPV,2035,6.00000000000 -3,2060,R1,solarPV,2035,6.00000000000 -3,2064,R1,solarPV,2035,6.00000000000 -4,2045,R1,solarPV,2040,6.00000000000 -4,2050,R1,solarPV,2040,6.00000000000 -4,2055,R1,solarPV,2040,6.00000000000 -4,2059,R1,solarPV,2040,6.00000000000 -4,2060,R1,solarPV,2040,6.00000000000 -4,2064,R1,solarPV,2040,6.00000000000 -4,2065,R1,solarPV,2040,6.00000000000 -4,2069,R1,solarPV,2040,6.00000000000 -5,2050,R1,solarPV,2045,6.00000000000 -5,2055,R1,solarPV,2045,6.00000000000 -5,2059,R1,solarPV,2045,6.00000000000 -5,2060,R1,solarPV,2045,6.00000000000 -5,2064,R1,solarPV,2045,6.00000000000 -5,2065,R1,solarPV,2045,6.00000000000 -5,2069,R1,solarPV,2045,6.00000000000 -5,2070,R1,solarPV,2045,6.00000000000 -5,2074,R1,solarPV,2045,6.00000000000 -6,2055,R1,solarPV,2050,1.50000000000 -6,2059,R1,solarPV,2050,1.50000000000 -6,2060,R1,solarPV,2050,1.50000000000 -6,2064,R1,solarPV,2050,1.50000000000 -6,2065,R1,solarPV,2050,1.50000000000 -6,2069,R1,solarPV,2050,1.50000000000 -6,2070,R1,solarPV,2050,1.50000000000 -6,2074,R1,solarPV,2050,1.50000000000 -6,2075,R1,solarPV,2050,1.50000000000 -6,2079,R1,solarPV,2050,1.50000000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,2.75000000000 +1,2035,R1,gasCCGT,2025,2.75000000000 +1,2040,R1,gasCCGT,2025,2.75000000000 +1,2045,R1,gasCCGT,2025,2.75000000000 +1,2049,R1,gasCCGT,2025,2.75000000000 +1,2050,R1,gasCCGT,2025,2.75000000000 +1,2054,R1,gasCCGT,2025,2.75000000000 +1,2055,R1,gasCCGT,2025,2.75000000000 +1,2059,R1,gasCCGT,2025,2.75000000000 +1,2060,R1,gasCCGT,2025,2.75000000000 +1,2064,R1,gasCCGT,2025,2.75000000000 +2,2035,R1,solarPV,2030,0.12500000000 +2,2040,R1,solarPV,2030,0.12500000000 +2,2045,R1,solarPV,2030,0.12500000000 +2,2049,R1,solarPV,2030,0.12500000000 +2,2050,R1,solarPV,2030,0.12500000000 +2,2054,R1,solarPV,2030,0.12500000000 +2,2055,R1,solarPV,2030,0.12500000000 +2,2059,R1,solarPV,2030,0.12500000000 +3,2040,R1,solarPV,2035,0.62500000000 +3,2045,R1,solarPV,2035,0.62500000000 +3,2049,R1,solarPV,2035,0.62500000000 +3,2050,R1,solarPV,2035,0.62500000000 +3,2054,R1,solarPV,2035,0.62500000000 +3,2055,R1,solarPV,2035,0.62500000000 +3,2059,R1,solarPV,2035,0.62500000000 +3,2060,R1,solarPV,2035,0.62500000000 +3,2064,R1,solarPV,2035,0.62500000000 +4,2045,R1,solarPV,2040,1.75000000000 +4,2049,R1,solarPV,2040,1.75000000000 +4,2050,R1,solarPV,2040,1.75000000000 +4,2054,R1,solarPV,2040,1.75000000000 +4,2055,R1,solarPV,2040,1.75000000000 +4,2059,R1,solarPV,2040,1.75000000000 +4,2060,R1,solarPV,2040,1.75000000000 +4,2064,R1,solarPV,2040,1.75000000000 +4,2065,R1,solarPV,2040,1.75000000000 +4,2069,R1,solarPV,2040,1.75000000000 +5,2049,R1,solarPV,2045,1.20000000000 +5,2050,R1,solarPV,2045,1.50000000000 +5,2054,R1,solarPV,2045,1.50000000000 +5,2055,R1,solarPV,2045,1.50000000000 +5,2059,R1,solarPV,2045,1.50000000000 +5,2060,R1,solarPV,2045,1.50000000000 +5,2064,R1,solarPV,2045,1.50000000000 +5,2065,R1,solarPV,2045,1.50000000000 +5,2069,R1,solarPV,2045,1.50000000000 +5,2070,R1,solarPV,2045,1.50000000000 +5,2074,R1,solarPV,2045,1.50000000000 +6,2055,R1,solarPV,2050,10.00000000000 +6,2059,R1,solarPV,2050,10.00000000000 +6,2060,R1,solarPV,2050,10.00000000000 +6,2064,R1,solarPV,2050,10.00000000000 +6,2065,R1,solarPV,2050,10.00000000000 +6,2069,R1,solarPV,2050,10.00000000000 +6,2070,R1,solarPV,2050,10.00000000000 +6,2074,R1,solarPV,2050,10.00000000000 +6,2075,R1,solarPV,2050,10.00000000000 +6,2079,R1,solarPV,2050,10.00000000000 +7,2025,R1,windturbine,2020,2.31250000000 +7,2030,R1,windturbine,2020,2.31250000000 +7,2035,R1,windturbine,2020,2.31250000000 +7,2040,R1,windturbine,2020,2.31250000000 +7,2045,R1,windturbine,2020,2.31250000000 +7,2049,R1,windturbine,2020,2.31250000000 +8,2030,R1,windturbine,2025,6.18750000000 +8,2035,R1,windturbine,2025,6.18750000000 +8,2040,R1,windturbine,2025,6.18750000000 +8,2045,R1,windturbine,2025,6.18750000000 +8,2049,R1,windturbine,2025,6.18750000000 +8,2050,R1,windturbine,2025,6.18750000000 +8,2054,R1,windturbine,2025,6.18750000000 +9,2035,R1,windturbine,2030,0.25000000000 +9,2040,R1,windturbine,2030,0.25000000000 +9,2045,R1,windturbine,2030,0.25000000000 +9,2049,R1,windturbine,2030,0.25000000000 +9,2050,R1,windturbine,2030,0.25000000000 +9,2054,R1,windturbine,2030,0.25000000000 +9,2055,R1,windturbine,2030,0.25000000000 +9,2059,R1,windturbine,2030,0.25000000000 +10,2040,R1,windturbine,2035,1.00000000000 +10,2045,R1,windturbine,2035,1.00000000000 +10,2049,R1,windturbine,2035,1.00000000000 +10,2050,R1,windturbine,2035,1.00000000000 +10,2054,R1,windturbine,2035,1.00000000000 +10,2055,R1,windturbine,2035,1.00000000000 +10,2059,R1,windturbine,2035,1.00000000000 +10,2060,R1,windturbine,2035,1.00000000000 +10,2064,R1,windturbine,2035,1.00000000000 +11,2045,R1,windturbine,2040,1.50000000000 +11,2049,R1,windturbine,2040,1.50000000000 +11,2050,R1,windturbine,2040,1.50000000000 +11,2054,R1,windturbine,2040,1.50000000000 +11,2055,R1,windturbine,2040,1.50000000000 +11,2059,R1,windturbine,2040,1.50000000000 +11,2060,R1,windturbine,2040,1.50000000000 +11,2064,R1,windturbine,2040,1.50000000000 +11,2065,R1,windturbine,2040,1.50000000000 +11,2069,R1,windturbine,2040,1.50000000000 +12,2050,R1,windturbine,2045,3.53130000000 +12,2054,R1,windturbine,2045,3.53130000000 +12,2055,R1,windturbine,2045,3.53130000000 +12,2059,R1,windturbine,2045,3.53130000000 +12,2060,R1,windturbine,2045,3.53130000000 +12,2064,R1,windturbine,2045,3.53130000000 +12,2065,R1,windturbine,2045,3.53130000000 +12,2069,R1,windturbine,2045,3.53130000000 +12,2070,R1,windturbine,2045,3.53130000000 +12,2074,R1,windturbine,2045,3.53130000000 +13,2055,R1,windturbine,2050,0.45310000000 +13,2059,R1,windturbine,2050,0.45310000000 +13,2060,R1,windturbine,2050,0.45310000000 +13,2064,R1,windturbine,2050,0.45310000000 +13,2065,R1,windturbine,2050,0.45310000000 +13,2069,R1,windturbine,2050,0.45310000000 +13,2070,R1,windturbine,2050,0.45310000000 +13,2074,R1,windturbine,2050,0.45310000000 +13,2075,R1,windturbine,2050,0.45310000000 +13,2079,R1,windturbine,2050,0.45310000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv index bcdf148c6..6c7acc17e 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv @@ -1,6 +1,8 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2025,R1,heatpump,2020,11.50000000000 +1,2030,R1,heatpump,2020,11.50000000000 +1,2034,R1,heatpump,2020,11.50000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv index 9d7ceeff7..f5dd92fa6 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv @@ -1,10 +1,16 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,5.50000000000 +1,2034,R1,gasboiler,2025,5.50000000000 +1,2035,R1,gasboiler,2025,5.50000000000 +1,2039,R1,gasboiler,2025,5.50000000000 +2,2025,R1,heatpump,2020,11.50000000000 +2,2030,R1,heatpump,2020,11.50000000000 +2,2034,R1,heatpump,2020,11.50000000000 +3,2030,R1,heatpump,2025,5.50000000000 +3,2034,R1,heatpump,2025,5.50000000000 +3,2035,R1,heatpump,2025,5.50000000000 +3,2039,R1,heatpump,2025,5.50000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv index b636c62a8..cf72eaf55 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv @@ -1,14 +1,24 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,5.50000000000 +1,2034,R1,gasboiler,2025,5.50000000000 +1,2035,R1,gasboiler,2025,5.50000000000 +1,2039,R1,gasboiler,2025,5.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2025,R1,heatpump,2020,11.50000000000 +3,2030,R1,heatpump,2020,11.50000000000 +3,2034,R1,heatpump,2020,11.50000000000 +4,2030,R1,heatpump,2025,5.50000000000 +4,2034,R1,heatpump,2025,5.50000000000 +4,2035,R1,heatpump,2025,5.50000000000 +4,2039,R1,heatpump,2025,5.50000000000 +5,2035,R1,heatpump,2030,12.50000000000 +5,2039,R1,heatpump,2030,12.50000000000 +5,2040,R1,heatpump,2030,12.50000000000 +5,2044,R1,heatpump,2030,12.50000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv index e9ff1cebf..12ddb0e95 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv @@ -1,18 +1,32 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 -4,2040,R1,heatpump,2035,17.00000000000 -4,2044,R1,heatpump,2035,17.00000000000 -4,2045,R1,heatpump,2035,17.00000000000 -4,2049,R1,heatpump,2035,17.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,5.50000000000 +1,2034,R1,gasboiler,2025,5.50000000000 +1,2035,R1,gasboiler,2025,5.50000000000 +1,2039,R1,gasboiler,2025,5.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2040,R1,gasboiler,2035,8.50000000000 +3,2044,R1,gasboiler,2035,8.50000000000 +3,2045,R1,gasboiler,2035,8.50000000000 +3,2049,R1,gasboiler,2035,8.50000000000 +4,2025,R1,heatpump,2020,11.50000000000 +4,2030,R1,heatpump,2020,11.50000000000 +4,2034,R1,heatpump,2020,11.50000000000 +5,2030,R1,heatpump,2025,5.50000000000 +5,2034,R1,heatpump,2025,5.50000000000 +5,2035,R1,heatpump,2025,5.50000000000 +5,2039,R1,heatpump,2025,5.50000000000 +6,2035,R1,heatpump,2030,12.50000000000 +6,2039,R1,heatpump,2030,12.50000000000 +6,2040,R1,heatpump,2030,12.50000000000 +6,2044,R1,heatpump,2030,12.50000000000 +7,2040,R1,heatpump,2035,8.50000000000 +7,2044,R1,heatpump,2035,8.50000000000 +7,2045,R1,heatpump,2035,8.50000000000 +7,2049,R1,heatpump,2035,8.50000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv index 2d54c0aa9..b23ff351e 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv @@ -1,22 +1,40 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 -4,2040,R1,heatpump,2035,17.00000000000 -4,2044,R1,heatpump,2035,17.00000000000 -4,2045,R1,heatpump,2035,17.00000000000 -4,2049,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2040,31.00000000000 -5,2049,R1,heatpump,2040,31.00000000000 -5,2050,R1,heatpump,2040,31.00000000000 -5,2054,R1,heatpump,2040,31.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,5.50000000000 +1,2034,R1,gasboiler,2025,5.50000000000 +1,2035,R1,gasboiler,2025,5.50000000000 +1,2039,R1,gasboiler,2025,5.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2040,R1,gasboiler,2035,8.50000000000 +3,2044,R1,gasboiler,2035,8.50000000000 +3,2045,R1,gasboiler,2035,8.50000000000 +3,2049,R1,gasboiler,2035,8.50000000000 +4,2045,R1,gasboiler,2040,15.50000000000 +4,2049,R1,gasboiler,2040,15.50000000000 +4,2050,R1,gasboiler,2040,15.50000000000 +4,2054,R1,gasboiler,2040,15.50000000000 +5,2025,R1,heatpump,2020,11.50000000000 +5,2030,R1,heatpump,2020,11.50000000000 +5,2034,R1,heatpump,2020,11.50000000000 +6,2030,R1,heatpump,2025,5.50000000000 +6,2034,R1,heatpump,2025,5.50000000000 +6,2035,R1,heatpump,2025,5.50000000000 +6,2039,R1,heatpump,2025,5.50000000000 +7,2035,R1,heatpump,2030,12.50000000000 +7,2039,R1,heatpump,2030,12.50000000000 +7,2040,R1,heatpump,2030,12.50000000000 +7,2044,R1,heatpump,2030,12.50000000000 +8,2040,R1,heatpump,2035,8.50000000000 +8,2044,R1,heatpump,2035,8.50000000000 +8,2045,R1,heatpump,2035,8.50000000000 +8,2049,R1,heatpump,2035,8.50000000000 +9,2045,R1,heatpump,2040,15.50000000000 +9,2049,R1,heatpump,2040,15.50000000000 +9,2050,R1,heatpump,2040,15.50000000000 +9,2054,R1,heatpump,2040,15.50000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv index 5924d03b5..15949c1b2 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv @@ -1,26 +1,48 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 -4,2040,R1,heatpump,2035,17.00000000000 -4,2044,R1,heatpump,2035,17.00000000000 -4,2045,R1,heatpump,2035,17.00000000000 -4,2049,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2040,31.00000000000 -5,2049,R1,heatpump,2040,31.00000000000 -5,2050,R1,heatpump,2040,31.00000000000 -5,2054,R1,heatpump,2040,31.00000000000 -6,2050,R1,heatpump,2045,23.00000000000 -6,2054,R1,heatpump,2045,23.00000000000 -6,2055,R1,heatpump,2045,23.00000000000 -6,2059,R1,heatpump,2045,23.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,5.50000000000 +1,2034,R1,gasboiler,2025,5.50000000000 +1,2035,R1,gasboiler,2025,5.50000000000 +1,2039,R1,gasboiler,2025,5.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2040,R1,gasboiler,2035,8.50000000000 +3,2044,R1,gasboiler,2035,8.50000000000 +3,2045,R1,gasboiler,2035,8.50000000000 +3,2049,R1,gasboiler,2035,8.50000000000 +4,2045,R1,gasboiler,2040,15.50000000000 +4,2049,R1,gasboiler,2040,15.50000000000 +4,2050,R1,gasboiler,2040,15.50000000000 +4,2054,R1,gasboiler,2040,15.50000000000 +5,2050,R1,gasboiler,2045,11.50000000000 +5,2054,R1,gasboiler,2045,11.50000000000 +5,2055,R1,gasboiler,2045,11.50000000000 +5,2059,R1,gasboiler,2045,11.50000000000 +6,2025,R1,heatpump,2020,11.50000000000 +6,2030,R1,heatpump,2020,11.50000000000 +6,2034,R1,heatpump,2020,11.50000000000 +7,2030,R1,heatpump,2025,5.50000000000 +7,2034,R1,heatpump,2025,5.50000000000 +7,2035,R1,heatpump,2025,5.50000000000 +7,2039,R1,heatpump,2025,5.50000000000 +8,2035,R1,heatpump,2030,12.50000000000 +8,2039,R1,heatpump,2030,12.50000000000 +8,2040,R1,heatpump,2030,12.50000000000 +8,2044,R1,heatpump,2030,12.50000000000 +9,2040,R1,heatpump,2035,8.50000000000 +9,2044,R1,heatpump,2035,8.50000000000 +9,2045,R1,heatpump,2035,8.50000000000 +9,2049,R1,heatpump,2035,8.50000000000 +10,2045,R1,heatpump,2040,15.50000000000 +10,2049,R1,heatpump,2040,15.50000000000 +10,2050,R1,heatpump,2040,15.50000000000 +10,2054,R1,heatpump,2040,15.50000000000 +11,2050,R1,heatpump,2045,11.50000000000 +11,2054,R1,heatpump,2045,11.50000000000 +11,2055,R1,heatpump,2045,11.50000000000 +11,2059,R1,heatpump,2045,11.50000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv index be30eaf2d..dc067eb38 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv @@ -1,30 +1,56 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 -4,2040,R1,heatpump,2035,17.00000000000 -4,2044,R1,heatpump,2035,17.00000000000 -4,2045,R1,heatpump,2035,17.00000000000 -4,2049,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2040,31.00000000000 -5,2049,R1,heatpump,2040,31.00000000000 -5,2050,R1,heatpump,2040,31.00000000000 -5,2054,R1,heatpump,2040,31.00000000000 -6,2050,R1,heatpump,2045,23.00000000000 -6,2054,R1,heatpump,2045,23.00000000000 -6,2055,R1,heatpump,2045,23.00000000000 -6,2059,R1,heatpump,2045,23.00000000000 -7,2055,R1,heatpump,2050,31.00000000000 -7,2059,R1,heatpump,2050,31.00000000000 -7,2060,R1,heatpump,2050,31.00000000000 -7,2064,R1,heatpump,2050,31.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,5.50000000000 +1,2034,R1,gasboiler,2025,5.50000000000 +1,2035,R1,gasboiler,2025,5.50000000000 +1,2039,R1,gasboiler,2025,5.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2040,R1,gasboiler,2035,8.50000000000 +3,2044,R1,gasboiler,2035,8.50000000000 +3,2045,R1,gasboiler,2035,8.50000000000 +3,2049,R1,gasboiler,2035,8.50000000000 +4,2045,R1,gasboiler,2040,15.50000000000 +4,2049,R1,gasboiler,2040,15.50000000000 +4,2050,R1,gasboiler,2040,15.50000000000 +4,2054,R1,gasboiler,2040,15.50000000000 +5,2050,R1,gasboiler,2045,11.50000000000 +5,2054,R1,gasboiler,2045,11.50000000000 +5,2055,R1,gasboiler,2045,11.50000000000 +5,2059,R1,gasboiler,2045,11.50000000000 +6,2055,R1,gasboiler,2050,15.50000000000 +6,2059,R1,gasboiler,2050,15.50000000000 +6,2060,R1,gasboiler,2050,15.50000000000 +6,2064,R1,gasboiler,2050,15.50000000000 +7,2025,R1,heatpump,2020,11.50000000000 +7,2030,R1,heatpump,2020,11.50000000000 +7,2034,R1,heatpump,2020,11.50000000000 +8,2030,R1,heatpump,2025,5.50000000000 +8,2034,R1,heatpump,2025,5.50000000000 +8,2035,R1,heatpump,2025,5.50000000000 +8,2039,R1,heatpump,2025,5.50000000000 +9,2035,R1,heatpump,2030,12.50000000000 +9,2039,R1,heatpump,2030,12.50000000000 +9,2040,R1,heatpump,2030,12.50000000000 +9,2044,R1,heatpump,2030,12.50000000000 +10,2040,R1,heatpump,2035,8.50000000000 +10,2044,R1,heatpump,2035,8.50000000000 +10,2045,R1,heatpump,2035,8.50000000000 +10,2049,R1,heatpump,2035,8.50000000000 +11,2045,R1,heatpump,2040,15.50000000000 +11,2049,R1,heatpump,2040,15.50000000000 +11,2050,R1,heatpump,2040,15.50000000000 +11,2054,R1,heatpump,2040,15.50000000000 +12,2050,R1,heatpump,2045,11.50000000000 +12,2054,R1,heatpump,2045,11.50000000000 +12,2055,R1,heatpump,2045,11.50000000000 +12,2059,R1,heatpump,2045,11.50000000000 +13,2055,R1,heatpump,2050,15.50000000000 +13,2059,R1,heatpump,2050,15.50000000000 +13,2060,R1,heatpump,2050,15.50000000000 +13,2064,R1,heatpump,2050,15.50000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv index 7b8c4061d..cdc2e5a40 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv @@ -1,31 +1,31 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000 -0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000 -0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000 +0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.69440000000 +0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.63890000000 0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000 -0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000 +0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,44.93750000000 1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000 -1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000 -1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000 +1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.04170000000 +1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.95830000000 1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000 -1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000 +1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,67.40620000000 2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000 -2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000 -2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000 +2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.69440000000 +2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000 2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000 -2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000 +2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,44.93750000000 3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000 -3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000 -3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000 +3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.04170000000 +3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000 3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000 -3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000 +3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,67.40620000000 4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000 -4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000 -4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000 +4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.08330000000 +4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000 4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000 -4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000 +4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,134.81250000000 5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000 -5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000 -5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000 +5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.38890000000 +5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.27780000000 5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000 -5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000 +5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,89.87500000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv index b07adde6b..9b0f35ee4 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv @@ -1,31 +1,55 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000 -0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000 -0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000 -0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000 -1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000 -1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000 -1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000 -1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000 -2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000 -2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000 -2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000 -2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000 -3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000 -3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000 -3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000 -3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000 -4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000 -4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000 -4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000 -4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000 -5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000 -5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000 -5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000 -5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000 +0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.69440000000 +0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,0.63890000000 +0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.41670000000 +0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.30560000000 +0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,0.63890000000 +0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.30560000000 +0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,44.93750000000 +0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,26.96250000000 +0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,19.77250000000 +1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.04170000000 +1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,0.95830000000 +1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.62500000000 +1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.45830000000 +1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,0.95830000000 +1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.45830000000 +1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,67.40620000000 +1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,40.44370000000 +1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,29.65870000000 +2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.69440000000 +2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000 +2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.41670000000 +2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.30560000000 +2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000 +2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.30560000000 +2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,44.93750000000 +2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,26.96250000000 +2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,19.77250000000 +3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.04170000000 +3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000 +3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.62500000000 +3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.45830000000 +3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000 +3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.45830000000 +3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,67.40620000000 +3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,40.44370000000 +3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,29.65870000000 +4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.08330000000 +4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000 +4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.25000000000 +4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.91670000000 +4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000 +4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,0.91670000000 +4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,134.81250000000 +4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,80.88750000000 +4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,59.31750000000 +5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.38890000000 +5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,1.27780000000 +5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,0.83330000000 +5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.61110000000 +5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,1.27780000000 +5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.61110000000 +5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,89.87500000000 +5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,53.92500000000 +5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,39.54500000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv index 33951ce29..c9c4ec68f 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv @@ -1,25 +1,73 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000 -0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000 -1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000 -1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000 -2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000 -2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000 -3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000 -3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000 -4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000 -4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000 -5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000 -5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000 +0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.41670000000 +0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.30560000000 +0,heat,2030,3,R1,all-year,all-week,night,heatpump,2020,0.63890000000 +0,heat,2030,4,R1,all-year,all-week,night,heatpump,2025,0.30560000000 +0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.30560000000 +0,heat,2035,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000 +0,heat,2035,4,R1,all-year,all-week,night,heatpump,2025,0.30560000000 +0,heat,2035,5,R1,all-year,all-week,night,heatpump,2030,0.69440000000 +0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,26.96250000000 +0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,19.77250000000 +0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,19.77250000000 +0,CO2f,2035,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000 +1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.62500000000 +1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.45830000000 +1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2020,0.95830000000 +1,heat,2030,4,R1,all-year,all-week,morning,heatpump,2025,0.45830000000 +1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.45830000000 +1,heat,2035,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000 +1,heat,2035,4,R1,all-year,all-week,morning,heatpump,2025,0.45830000000 +1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2030,1.04170000000 +1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,40.44370000000 +1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,29.65870000000 +1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,29.65870000000 +1,CO2f,2035,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000 +2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.41670000000 +2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.30560000000 +2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000 +2,heat,2030,4,R1,all-year,all-week,afternoon,heatpump,2025,0.30560000000 +2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.30560000000 +2,heat,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000 +2,heat,2035,4,R1,all-year,all-week,afternoon,heatpump,2025,0.30560000000 +2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000 +2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,26.96250000000 +2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,19.77250000000 +2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,19.77250000000 +2,CO2f,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000 +3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.62500000000 +3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.45830000000 +3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000 +3,heat,2030,4,R1,all-year,all-week,early-peak,heatpump,2025,0.45830000000 +3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.45830000000 +3,heat,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000 +3,heat,2035,4,R1,all-year,all-week,early-peak,heatpump,2025,0.45830000000 +3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000 +3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,40.44370000000 +3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,29.65870000000 +3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,29.65870000000 +3,CO2f,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000 +4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.25000000000 +4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.91670000000 +4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000 +4,heat,2030,4,R1,all-year,all-week,late-peak,heatpump,2025,0.91670000000 +4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.91670000000 +4,heat,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000 +4,heat,2035,4,R1,all-year,all-week,late-peak,heatpump,2025,0.91670000000 +4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000 +4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,80.88750000000 +4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,59.31750000000 +4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,59.31750000000 +4,CO2f,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000 +5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,0.83330000000 +5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.61110000000 +5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2020,1.27780000000 +5,heat,2030,4,R1,all-year,all-week,evening,heatpump,2025,0.61110000000 +5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.61110000000 +5,heat,2035,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000 +5,heat,2035,4,R1,all-year,all-week,evening,heatpump,2025,0.61110000000 +5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2030,1.38890000000 +5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,53.92500000000 +5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,39.54500000000 +5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,39.54500000000 +5,CO2f,2035,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv index c606a299c..bce20e542 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv @@ -1,25 +1,73 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000 -0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000 -0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000 -1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000 -1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000 -2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000 -2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000 -3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000 -3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000 -4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000 -4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000 -5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000 -5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 +0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.30560000000 +0,heat,2035,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000 +0,heat,2035,5,R1,all-year,all-week,night,heatpump,2025,0.30560000000 +0,heat,2035,6,R1,all-year,all-week,night,heatpump,2030,0.69440000000 +0,heat,2040,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000 +0,heat,2040,3,R1,all-year,all-week,night,gasboiler,2035,0.47220000000 +0,heat,2040,6,R1,all-year,all-week,night,heatpump,2030,0.69440000000 +0,heat,2040,7,R1,all-year,all-week,night,heatpump,2035,0.47220000000 +0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,19.77250000000 +0,CO2f,2035,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000 +0,CO2f,2040,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000 +0,CO2f,2040,3,R1,all-year,all-week,night,gasboiler,2035,30.55750000000 +1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.45830000000 +1,heat,2035,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000 +1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2025,0.45830000000 +1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2030,1.04170000000 +1,heat,2040,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000 +1,heat,2040,3,R1,all-year,all-week,morning,gasboiler,2035,0.70830000000 +1,heat,2040,6,R1,all-year,all-week,morning,heatpump,2030,1.04170000000 +1,heat,2040,7,R1,all-year,all-week,morning,heatpump,2035,0.70830000000 +1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,29.65870000000 +1,CO2f,2035,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000 +1,CO2f,2040,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000 +1,CO2f,2040,3,R1,all-year,all-week,morning,gasboiler,2035,45.83620000000 +2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.30560000000 +2,heat,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000 +2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2025,0.30560000000 +2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000 +2,heat,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000 +2,heat,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.47220000000 +2,heat,2040,6,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000 +2,heat,2040,7,R1,all-year,all-week,afternoon,heatpump,2035,0.47220000000 +2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,19.77250000000 +2,CO2f,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000 +2,CO2f,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000 +2,CO2f,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,30.55750000000 +3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.45830000000 +3,heat,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000 +3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2025,0.45830000000 +3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000 +3,heat,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000 +3,heat,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.70830000000 +3,heat,2040,6,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000 +3,heat,2040,7,R1,all-year,all-week,early-peak,heatpump,2035,0.70830000000 +3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,29.65870000000 +3,CO2f,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000 +3,CO2f,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000 +3,CO2f,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,45.83620000000 +4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.91670000000 +4,heat,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000 +4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2025,0.91670000000 +4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000 +4,heat,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000 +4,heat,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,1.41670000000 +4,heat,2040,6,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000 +4,heat,2040,7,R1,all-year,all-week,late-peak,heatpump,2035,1.41670000000 +4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,59.31750000000 +4,CO2f,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000 +4,CO2f,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000 +4,CO2f,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,91.67250000000 +5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.61110000000 +5,heat,2035,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000 +5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2025,0.61110000000 +5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2030,1.38890000000 +5,heat,2040,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000 +5,heat,2040,3,R1,all-year,all-week,evening,gasboiler,2035,0.94440000000 +5,heat,2040,6,R1,all-year,all-week,evening,heatpump,2030,1.38890000000 +5,heat,2040,7,R1,all-year,all-week,evening,heatpump,2035,0.94440000000 +5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,39.54500000000 +5,CO2f,2035,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000 +5,CO2f,2040,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000 +5,CO2f,2040,3,R1,all-year,all-week,evening,gasboiler,2035,61.11500000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv index d66038bc0..5ef6737bb 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv @@ -1,25 +1,73 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000 -0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000 -1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000 -2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000 -3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000 -4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000 -5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 +0,heat,2040,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000 +0,heat,2040,3,R1,all-year,all-week,night,gasboiler,2035,0.47220000000 +0,heat,2040,7,R1,all-year,all-week,night,heatpump,2030,0.69440000000 +0,heat,2040,8,R1,all-year,all-week,night,heatpump,2035,0.47220000000 +0,heat,2045,3,R1,all-year,all-week,night,gasboiler,2035,0.47220000000 +0,heat,2045,4,R1,all-year,all-week,night,gasboiler,2040,0.86110000000 +0,heat,2045,8,R1,all-year,all-week,night,heatpump,2035,0.47220000000 +0,heat,2045,9,R1,all-year,all-week,night,heatpump,2040,0.86110000000 +0,CO2f,2040,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000 +0,CO2f,2040,3,R1,all-year,all-week,night,gasboiler,2035,30.55750000000 +0,CO2f,2045,3,R1,all-year,all-week,night,gasboiler,2035,30.55750000000 +0,CO2f,2045,4,R1,all-year,all-week,night,gasboiler,2040,55.72250000000 +1,heat,2040,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000 +1,heat,2040,3,R1,all-year,all-week,morning,gasboiler,2035,0.70830000000 +1,heat,2040,7,R1,all-year,all-week,morning,heatpump,2030,1.04170000000 +1,heat,2040,8,R1,all-year,all-week,morning,heatpump,2035,0.70830000000 +1,heat,2045,3,R1,all-year,all-week,morning,gasboiler,2035,0.70830000000 +1,heat,2045,4,R1,all-year,all-week,morning,gasboiler,2040,1.29170000000 +1,heat,2045,8,R1,all-year,all-week,morning,heatpump,2035,0.70830000000 +1,heat,2045,9,R1,all-year,all-week,morning,heatpump,2040,1.29170000000 +1,CO2f,2040,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000 +1,CO2f,2040,3,R1,all-year,all-week,morning,gasboiler,2035,45.83620000000 +1,CO2f,2045,3,R1,all-year,all-week,morning,gasboiler,2035,45.83620000000 +1,CO2f,2045,4,R1,all-year,all-week,morning,gasboiler,2040,83.58380000000 +2,heat,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000 +2,heat,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.47220000000 +2,heat,2040,7,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000 +2,heat,2040,8,R1,all-year,all-week,afternoon,heatpump,2035,0.47220000000 +2,heat,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.47220000000 +2,heat,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.86110000000 +2,heat,2045,8,R1,all-year,all-week,afternoon,heatpump,2035,0.47220000000 +2,heat,2045,9,R1,all-year,all-week,afternoon,heatpump,2040,0.86110000000 +2,CO2f,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000 +2,CO2f,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,30.55750000000 +2,CO2f,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,30.55750000000 +2,CO2f,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,55.72250000000 +3,heat,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000 +3,heat,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.70830000000 +3,heat,2040,7,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000 +3,heat,2040,8,R1,all-year,all-week,early-peak,heatpump,2035,0.70830000000 +3,heat,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.70830000000 +3,heat,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,1.29170000000 +3,heat,2045,8,R1,all-year,all-week,early-peak,heatpump,2035,0.70830000000 +3,heat,2045,9,R1,all-year,all-week,early-peak,heatpump,2040,1.29170000000 +3,CO2f,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000 +3,CO2f,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,45.83620000000 +3,CO2f,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,45.83620000000 +3,CO2f,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,83.58380000000 +4,heat,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000 +4,heat,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,1.41670000000 +4,heat,2040,7,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000 +4,heat,2040,8,R1,all-year,all-week,late-peak,heatpump,2035,1.41670000000 +4,heat,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,1.41670000000 +4,heat,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,2.58330000000 +4,heat,2045,8,R1,all-year,all-week,late-peak,heatpump,2035,1.41670000000 +4,heat,2045,9,R1,all-year,all-week,late-peak,heatpump,2040,2.58330000000 +4,CO2f,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000 +4,CO2f,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,91.67250000000 +4,CO2f,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,91.67250000000 +4,CO2f,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,167.16750000000 +5,heat,2040,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000 +5,heat,2040,3,R1,all-year,all-week,evening,gasboiler,2035,0.94440000000 +5,heat,2040,7,R1,all-year,all-week,evening,heatpump,2030,1.38890000000 +5,heat,2040,8,R1,all-year,all-week,evening,heatpump,2035,0.94440000000 +5,heat,2045,3,R1,all-year,all-week,evening,gasboiler,2035,0.94440000000 +5,heat,2045,4,R1,all-year,all-week,evening,gasboiler,2040,1.72220000000 +5,heat,2045,8,R1,all-year,all-week,evening,heatpump,2035,0.94440000000 +5,heat,2045,9,R1,all-year,all-week,evening,heatpump,2040,1.72220000000 +5,CO2f,2040,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000 +5,CO2f,2040,3,R1,all-year,all-week,evening,gasboiler,2035,61.11500000000 +5,CO2f,2045,3,R1,all-year,all-week,evening,gasboiler,2035,61.11500000000 +5,CO2f,2045,4,R1,all-year,all-week,evening,gasboiler,2040,111.44500000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv index 2f0389d3c..e80874b99 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv @@ -1,25 +1,73 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000 -1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 -2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 -3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 -4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 -5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 +0,heat,2045,3,R1,all-year,all-week,night,gasboiler,2035,0.47220000000 +0,heat,2045,4,R1,all-year,all-week,night,gasboiler,2040,0.86110000000 +0,heat,2045,9,R1,all-year,all-week,night,heatpump,2035,0.47220000000 +0,heat,2045,10,R1,all-year,all-week,night,heatpump,2040,0.86110000000 +0,heat,2050,4,R1,all-year,all-week,night,gasboiler,2040,0.86110000000 +0,heat,2050,5,R1,all-year,all-week,night,gasboiler,2045,0.63890000000 +0,heat,2050,10,R1,all-year,all-week,night,heatpump,2040,0.86110000000 +0,heat,2050,11,R1,all-year,all-week,night,heatpump,2045,0.63890000000 +0,CO2f,2045,3,R1,all-year,all-week,night,gasboiler,2035,30.55750000000 +0,CO2f,2045,4,R1,all-year,all-week,night,gasboiler,2040,55.72250000000 +0,CO2f,2050,4,R1,all-year,all-week,night,gasboiler,2040,55.72250000000 +0,CO2f,2050,5,R1,all-year,all-week,night,gasboiler,2045,41.34250000000 +1,heat,2045,3,R1,all-year,all-week,morning,gasboiler,2035,0.70830000000 +1,heat,2045,4,R1,all-year,all-week,morning,gasboiler,2040,1.29170000000 +1,heat,2045,9,R1,all-year,all-week,morning,heatpump,2035,0.70830000000 +1,heat,2045,10,R1,all-year,all-week,morning,heatpump,2040,1.29170000000 +1,heat,2050,4,R1,all-year,all-week,morning,gasboiler,2040,1.29170000000 +1,heat,2050,5,R1,all-year,all-week,morning,gasboiler,2045,0.95830000000 +1,heat,2050,10,R1,all-year,all-week,morning,heatpump,2040,1.29170000000 +1,heat,2050,11,R1,all-year,all-week,morning,heatpump,2045,0.95830000000 +1,CO2f,2045,3,R1,all-year,all-week,morning,gasboiler,2035,45.83620000000 +1,CO2f,2045,4,R1,all-year,all-week,morning,gasboiler,2040,83.58380000000 +1,CO2f,2050,4,R1,all-year,all-week,morning,gasboiler,2040,83.58380000000 +1,CO2f,2050,5,R1,all-year,all-week,morning,gasboiler,2045,62.01370000000 +2,heat,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.47220000000 +2,heat,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.86110000000 +2,heat,2045,9,R1,all-year,all-week,afternoon,heatpump,2035,0.47220000000 +2,heat,2045,10,R1,all-year,all-week,afternoon,heatpump,2040,0.86110000000 +2,heat,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.86110000000 +2,heat,2050,5,R1,all-year,all-week,afternoon,gasboiler,2045,0.63890000000 +2,heat,2050,10,R1,all-year,all-week,afternoon,heatpump,2040,0.86110000000 +2,heat,2050,11,R1,all-year,all-week,afternoon,heatpump,2045,0.63890000000 +2,CO2f,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,30.55750000000 +2,CO2f,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,55.72250000000 +2,CO2f,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,55.72250000000 +2,CO2f,2050,5,R1,all-year,all-week,afternoon,gasboiler,2045,41.34250000000 +3,heat,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.70830000000 +3,heat,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,1.29170000000 +3,heat,2045,9,R1,all-year,all-week,early-peak,heatpump,2035,0.70830000000 +3,heat,2045,10,R1,all-year,all-week,early-peak,heatpump,2040,1.29170000000 +3,heat,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,1.29170000000 +3,heat,2050,5,R1,all-year,all-week,early-peak,gasboiler,2045,0.95830000000 +3,heat,2050,10,R1,all-year,all-week,early-peak,heatpump,2040,1.29170000000 +3,heat,2050,11,R1,all-year,all-week,early-peak,heatpump,2045,0.95830000000 +3,CO2f,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,45.83620000000 +3,CO2f,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,83.58380000000 +3,CO2f,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,83.58380000000 +3,CO2f,2050,5,R1,all-year,all-week,early-peak,gasboiler,2045,62.01370000000 +4,heat,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,1.41670000000 +4,heat,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,2.58330000000 +4,heat,2045,9,R1,all-year,all-week,late-peak,heatpump,2035,1.41670000000 +4,heat,2045,10,R1,all-year,all-week,late-peak,heatpump,2040,2.58330000000 +4,heat,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,2.58330000000 +4,heat,2050,5,R1,all-year,all-week,late-peak,gasboiler,2045,1.91670000000 +4,heat,2050,10,R1,all-year,all-week,late-peak,heatpump,2040,2.58330000000 +4,heat,2050,11,R1,all-year,all-week,late-peak,heatpump,2045,1.91670000000 +4,CO2f,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,91.67250000000 +4,CO2f,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,167.16750000000 +4,CO2f,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,167.16750000000 +4,CO2f,2050,5,R1,all-year,all-week,late-peak,gasboiler,2045,124.02750000000 +5,heat,2045,3,R1,all-year,all-week,evening,gasboiler,2035,0.94440000000 +5,heat,2045,4,R1,all-year,all-week,evening,gasboiler,2040,1.72220000000 +5,heat,2045,9,R1,all-year,all-week,evening,heatpump,2035,0.94440000000 +5,heat,2045,10,R1,all-year,all-week,evening,heatpump,2040,1.72220000000 +5,heat,2050,4,R1,all-year,all-week,evening,gasboiler,2040,1.72220000000 +5,heat,2050,5,R1,all-year,all-week,evening,gasboiler,2045,1.27780000000 +5,heat,2050,10,R1,all-year,all-week,evening,heatpump,2040,1.72220000000 +5,heat,2050,11,R1,all-year,all-week,evening,heatpump,2045,1.27780000000 +5,CO2f,2045,3,R1,all-year,all-week,evening,gasboiler,2035,61.11500000000 +5,CO2f,2045,4,R1,all-year,all-week,evening,gasboiler,2040,111.44500000000 +5,CO2f,2050,4,R1,all-year,all-week,evening,gasboiler,2040,111.44500000000 +5,CO2f,2050,5,R1,all-year,all-week,evening,gasboiler,2045,82.68500000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv index 3b6658d81..a4293e9c5 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv @@ -1,25 +1,73 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000 -0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000 -0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000 -1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 -1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 -1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000 -2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 -2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 -2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000 -3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 -3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 -3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000 -4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 -4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 -4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000 -5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 -5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 -5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000 +0,heat,2050,4,R1,all-year,all-week,night,gasboiler,2040,0.86110000000 +0,heat,2050,5,R1,all-year,all-week,night,gasboiler,2045,0.63890000000 +0,heat,2050,11,R1,all-year,all-week,night,heatpump,2040,0.86110000000 +0,heat,2050,12,R1,all-year,all-week,night,heatpump,2045,0.63890000000 +0,heat,2055,5,R1,all-year,all-week,night,gasboiler,2045,0.63890000000 +0,heat,2055,6,R1,all-year,all-week,night,gasboiler,2050,0.86110000000 +0,heat,2055,12,R1,all-year,all-week,night,heatpump,2045,0.63890000000 +0,heat,2055,13,R1,all-year,all-week,night,heatpump,2050,0.86110000000 +0,CO2f,2050,4,R1,all-year,all-week,night,gasboiler,2040,55.72250000000 +0,CO2f,2050,5,R1,all-year,all-week,night,gasboiler,2045,41.34250000000 +0,CO2f,2055,5,R1,all-year,all-week,night,gasboiler,2045,41.34250000000 +0,CO2f,2055,6,R1,all-year,all-week,night,gasboiler,2050,55.72250000000 +1,heat,2050,4,R1,all-year,all-week,morning,gasboiler,2040,1.29170000000 +1,heat,2050,5,R1,all-year,all-week,morning,gasboiler,2045,0.95830000000 +1,heat,2050,11,R1,all-year,all-week,morning,heatpump,2040,1.29170000000 +1,heat,2050,12,R1,all-year,all-week,morning,heatpump,2045,0.95830000000 +1,heat,2055,5,R1,all-year,all-week,morning,gasboiler,2045,0.95830000000 +1,heat,2055,6,R1,all-year,all-week,morning,gasboiler,2050,1.29170000000 +1,heat,2055,12,R1,all-year,all-week,morning,heatpump,2045,0.95830000000 +1,heat,2055,13,R1,all-year,all-week,morning,heatpump,2050,1.29170000000 +1,CO2f,2050,4,R1,all-year,all-week,morning,gasboiler,2040,83.58380000000 +1,CO2f,2050,5,R1,all-year,all-week,morning,gasboiler,2045,62.01370000000 +1,CO2f,2055,5,R1,all-year,all-week,morning,gasboiler,2045,62.01370000000 +1,CO2f,2055,6,R1,all-year,all-week,morning,gasboiler,2050,83.58380000000 +2,heat,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.86110000000 +2,heat,2050,5,R1,all-year,all-week,afternoon,gasboiler,2045,0.63890000000 +2,heat,2050,11,R1,all-year,all-week,afternoon,heatpump,2040,0.86110000000 +2,heat,2050,12,R1,all-year,all-week,afternoon,heatpump,2045,0.63890000000 +2,heat,2055,5,R1,all-year,all-week,afternoon,gasboiler,2045,0.63890000000 +2,heat,2055,6,R1,all-year,all-week,afternoon,gasboiler,2050,0.86110000000 +2,heat,2055,12,R1,all-year,all-week,afternoon,heatpump,2045,0.63890000000 +2,heat,2055,13,R1,all-year,all-week,afternoon,heatpump,2050,0.86110000000 +2,CO2f,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,55.72250000000 +2,CO2f,2050,5,R1,all-year,all-week,afternoon,gasboiler,2045,41.34250000000 +2,CO2f,2055,5,R1,all-year,all-week,afternoon,gasboiler,2045,41.34250000000 +2,CO2f,2055,6,R1,all-year,all-week,afternoon,gasboiler,2050,55.72250000000 +3,heat,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,1.29170000000 +3,heat,2050,5,R1,all-year,all-week,early-peak,gasboiler,2045,0.95830000000 +3,heat,2050,11,R1,all-year,all-week,early-peak,heatpump,2040,1.29170000000 +3,heat,2050,12,R1,all-year,all-week,early-peak,heatpump,2045,0.95830000000 +3,heat,2055,5,R1,all-year,all-week,early-peak,gasboiler,2045,0.95830000000 +3,heat,2055,6,R1,all-year,all-week,early-peak,gasboiler,2050,1.29170000000 +3,heat,2055,12,R1,all-year,all-week,early-peak,heatpump,2045,0.95830000000 +3,heat,2055,13,R1,all-year,all-week,early-peak,heatpump,2050,1.29170000000 +3,CO2f,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,83.58380000000 +3,CO2f,2050,5,R1,all-year,all-week,early-peak,gasboiler,2045,62.01370000000 +3,CO2f,2055,5,R1,all-year,all-week,early-peak,gasboiler,2045,62.01370000000 +3,CO2f,2055,6,R1,all-year,all-week,early-peak,gasboiler,2050,83.58380000000 +4,heat,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,2.58330000000 +4,heat,2050,5,R1,all-year,all-week,late-peak,gasboiler,2045,1.91670000000 +4,heat,2050,11,R1,all-year,all-week,late-peak,heatpump,2040,2.58330000000 +4,heat,2050,12,R1,all-year,all-week,late-peak,heatpump,2045,1.91670000000 +4,heat,2055,5,R1,all-year,all-week,late-peak,gasboiler,2045,1.91670000000 +4,heat,2055,6,R1,all-year,all-week,late-peak,gasboiler,2050,2.58330000000 +4,heat,2055,12,R1,all-year,all-week,late-peak,heatpump,2045,1.91670000000 +4,heat,2055,13,R1,all-year,all-week,late-peak,heatpump,2050,2.58330000000 +4,CO2f,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,167.16750000000 +4,CO2f,2050,5,R1,all-year,all-week,late-peak,gasboiler,2045,124.02750000000 +4,CO2f,2055,5,R1,all-year,all-week,late-peak,gasboiler,2045,124.02750000000 +4,CO2f,2055,6,R1,all-year,all-week,late-peak,gasboiler,2050,167.16750000000 +5,heat,2050,4,R1,all-year,all-week,evening,gasboiler,2040,1.72220000000 +5,heat,2050,5,R1,all-year,all-week,evening,gasboiler,2045,1.27780000000 +5,heat,2050,11,R1,all-year,all-week,evening,heatpump,2040,1.72220000000 +5,heat,2050,12,R1,all-year,all-week,evening,heatpump,2045,1.27780000000 +5,heat,2055,5,R1,all-year,all-week,evening,gasboiler,2045,1.27780000000 +5,heat,2055,6,R1,all-year,all-week,evening,gasboiler,2050,1.72220000000 +5,heat,2055,12,R1,all-year,all-week,evening,heatpump,2045,1.27780000000 +5,heat,2055,13,R1,all-year,all-week,evening,heatpump,2050,1.72220000000 +5,CO2f,2050,4,R1,all-year,all-week,evening,gasboiler,2040,111.44500000000 +5,CO2f,2050,5,R1,all-year,all-week,evening,gasboiler,2045,82.68500000000 +5,CO2f,2055,5,R1,all-year,all-week,evening,gasboiler,2045,82.68500000000 +5,CO2f,2055,6,R1,all-year,all-week,evening,gasboiler,2050,111.44500000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv index 1affc5cd0..6dbd44f6a 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv @@ -1,3 +1,3 @@ AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,New -Agent2,A2,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,New +Agent2,A2,R1,fuel_consumption_cost,,,1,,,True,,,all,singleObj,0.5,-1,inf,New diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv index d1ee882b2..c7a43f048 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv @@ -1,4 +1,9 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,15.00000000000 -0,2030,R1,gassupply1,2020,7.50000000000 +0,2025,R1,gassupply1,2020,19.46470000000 +0,2030,R1,gassupply1,2020,11.96470000000 +0,2035,R1,gassupply1,2020,4.46470000000 +0,2040,R1,gassupply1,2020,4.46470000000 +0,2045,R1,gassupply1,2020,4.46470000000 +0,2050,R1,gassupply1,2020,4.46470000000 +0,2059,R1,gassupply1,2020,4.46470000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv index 4261765d4..59d409373 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv @@ -1,10 +1,17 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,15.00000000000 -0,2030,R1,gassupply1,2020,7.50000000000 -1,2030,R1,gassupply1,2025,3.63330000000 -1,2035,R1,gassupply1,2025,3.63330000000 -1,2040,R1,gassupply1,2025,3.63330000000 -1,2045,R1,gassupply1,2025,3.63330000000 -1,2050,R1,gassupply1,2025,3.63330000000 -1,2064,R1,gassupply1,2025,3.63330000000 +0,2025,R1,gassupply1,2020,19.46470000000 +0,2030,R1,gassupply1,2020,11.96470000000 +0,2035,R1,gassupply1,2020,4.46470000000 +0,2040,R1,gassupply1,2020,4.46470000000 +0,2045,R1,gassupply1,2020,4.46470000000 +0,2050,R1,gassupply1,2020,4.46470000000 +0,2059,R1,gassupply1,2020,4.46470000000 +1,2030,R1,gassupply1,2025,7.88760000000 +1,2035,R1,gassupply1,2025,7.88760000000 +1,2040,R1,gassupply1,2025,7.88760000000 +1,2045,R1,gassupply1,2025,7.88760000000 +1,2050,R1,gassupply1,2025,7.88760000000 +1,2059,R1,gassupply1,2025,7.88760000000 +1,2060,R1,gassupply1,2025,7.88760000000 +1,2064,R1,gassupply1,2025,7.88760000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv index 235026caa..d65885a4e 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv @@ -1,17 +1,26 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,15.00000000000 -0,2030,R1,gassupply1,2020,7.50000000000 -1,2030,R1,gassupply1,2025,3.63330000000 -1,2035,R1,gassupply1,2025,3.63330000000 -1,2040,R1,gassupply1,2025,3.63330000000 -1,2045,R1,gassupply1,2025,3.63330000000 -1,2050,R1,gassupply1,2025,3.63330000000 -1,2064,R1,gassupply1,2025,3.63330000000 -2,2035,R1,gassupply1,2030,8.89170000000 -2,2040,R1,gassupply1,2030,8.89170000000 -2,2045,R1,gassupply1,2030,8.89170000000 -2,2050,R1,gassupply1,2030,8.89170000000 -2,2064,R1,gassupply1,2030,8.89170000000 -2,2065,R1,gassupply1,2030,8.89170000000 -2,2069,R1,gassupply1,2030,8.89170000000 +0,2025,R1,gassupply1,2020,19.46470000000 +0,2030,R1,gassupply1,2020,11.96470000000 +0,2035,R1,gassupply1,2020,4.46470000000 +0,2040,R1,gassupply1,2020,4.46470000000 +0,2045,R1,gassupply1,2020,4.46470000000 +0,2050,R1,gassupply1,2020,4.46470000000 +0,2059,R1,gassupply1,2020,4.46470000000 +1,2030,R1,gassupply1,2025,7.88760000000 +1,2035,R1,gassupply1,2025,7.88760000000 +1,2040,R1,gassupply1,2025,7.88760000000 +1,2045,R1,gassupply1,2025,7.88760000000 +1,2050,R1,gassupply1,2025,7.88760000000 +1,2059,R1,gassupply1,2025,7.88760000000 +1,2060,R1,gassupply1,2025,7.88760000000 +1,2064,R1,gassupply1,2025,7.88760000000 +2,2035,R1,gassupply1,2030,10.89990000000 +2,2040,R1,gassupply1,2030,10.89990000000 +2,2045,R1,gassupply1,2030,10.89990000000 +2,2050,R1,gassupply1,2030,10.89990000000 +2,2059,R1,gassupply1,2030,10.89990000000 +2,2060,R1,gassupply1,2030,10.89990000000 +2,2064,R1,gassupply1,2030,10.89990000000 +2,2065,R1,gassupply1,2030,10.89990000000 +2,2069,R1,gassupply1,2030,10.89990000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv index 235026caa..323910b3b 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv @@ -1,17 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,15.00000000000 -0,2030,R1,gassupply1,2020,7.50000000000 -1,2030,R1,gassupply1,2025,3.63330000000 -1,2035,R1,gassupply1,2025,3.63330000000 -1,2040,R1,gassupply1,2025,3.63330000000 -1,2045,R1,gassupply1,2025,3.63330000000 -1,2050,R1,gassupply1,2025,3.63330000000 -1,2064,R1,gassupply1,2025,3.63330000000 -2,2035,R1,gassupply1,2030,8.89170000000 -2,2040,R1,gassupply1,2030,8.89170000000 -2,2045,R1,gassupply1,2030,8.89170000000 -2,2050,R1,gassupply1,2030,8.89170000000 -2,2064,R1,gassupply1,2030,8.89170000000 -2,2065,R1,gassupply1,2030,8.89170000000 -2,2069,R1,gassupply1,2030,8.89170000000 +0,2025,R1,gassupply1,2020,19.46470000000 +0,2030,R1,gassupply1,2020,11.96470000000 +0,2035,R1,gassupply1,2020,4.46470000000 +0,2040,R1,gassupply1,2020,4.46470000000 +0,2045,R1,gassupply1,2020,4.46470000000 +0,2050,R1,gassupply1,2020,4.46470000000 +0,2059,R1,gassupply1,2020,4.46470000000 +1,2030,R1,gassupply1,2025,7.88760000000 +1,2035,R1,gassupply1,2025,7.88760000000 +1,2040,R1,gassupply1,2025,7.88760000000 +1,2045,R1,gassupply1,2025,7.88760000000 +1,2050,R1,gassupply1,2025,7.88760000000 +1,2059,R1,gassupply1,2025,7.88760000000 +1,2060,R1,gassupply1,2025,7.88760000000 +1,2064,R1,gassupply1,2025,7.88760000000 +2,2035,R1,gassupply1,2030,10.89990000000 +2,2040,R1,gassupply1,2030,10.89990000000 +2,2045,R1,gassupply1,2030,10.89990000000 +2,2050,R1,gassupply1,2030,10.89990000000 +2,2059,R1,gassupply1,2030,10.89990000000 +2,2060,R1,gassupply1,2030,10.89990000000 +2,2064,R1,gassupply1,2030,10.89990000000 +2,2065,R1,gassupply1,2030,10.89990000000 +2,2069,R1,gassupply1,2030,10.89990000000 +3,2040,R1,gassupply1,2035,0.01580000000 +3,2045,R1,gassupply1,2035,0.01580000000 +3,2050,R1,gassupply1,2035,0.01580000000 +3,2059,R1,gassupply1,2035,0.01580000000 +3,2060,R1,gassupply1,2035,0.01580000000 +3,2064,R1,gassupply1,2035,0.01580000000 +3,2065,R1,gassupply1,2035,0.01580000000 +3,2069,R1,gassupply1,2035,0.01580000000 +3,2070,R1,gassupply1,2035,0.01580000000 +3,2074,R1,gassupply1,2035,0.01580000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv index 235026caa..323910b3b 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv @@ -1,17 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,15.00000000000 -0,2030,R1,gassupply1,2020,7.50000000000 -1,2030,R1,gassupply1,2025,3.63330000000 -1,2035,R1,gassupply1,2025,3.63330000000 -1,2040,R1,gassupply1,2025,3.63330000000 -1,2045,R1,gassupply1,2025,3.63330000000 -1,2050,R1,gassupply1,2025,3.63330000000 -1,2064,R1,gassupply1,2025,3.63330000000 -2,2035,R1,gassupply1,2030,8.89170000000 -2,2040,R1,gassupply1,2030,8.89170000000 -2,2045,R1,gassupply1,2030,8.89170000000 -2,2050,R1,gassupply1,2030,8.89170000000 -2,2064,R1,gassupply1,2030,8.89170000000 -2,2065,R1,gassupply1,2030,8.89170000000 -2,2069,R1,gassupply1,2030,8.89170000000 +0,2025,R1,gassupply1,2020,19.46470000000 +0,2030,R1,gassupply1,2020,11.96470000000 +0,2035,R1,gassupply1,2020,4.46470000000 +0,2040,R1,gassupply1,2020,4.46470000000 +0,2045,R1,gassupply1,2020,4.46470000000 +0,2050,R1,gassupply1,2020,4.46470000000 +0,2059,R1,gassupply1,2020,4.46470000000 +1,2030,R1,gassupply1,2025,7.88760000000 +1,2035,R1,gassupply1,2025,7.88760000000 +1,2040,R1,gassupply1,2025,7.88760000000 +1,2045,R1,gassupply1,2025,7.88760000000 +1,2050,R1,gassupply1,2025,7.88760000000 +1,2059,R1,gassupply1,2025,7.88760000000 +1,2060,R1,gassupply1,2025,7.88760000000 +1,2064,R1,gassupply1,2025,7.88760000000 +2,2035,R1,gassupply1,2030,10.89990000000 +2,2040,R1,gassupply1,2030,10.89990000000 +2,2045,R1,gassupply1,2030,10.89990000000 +2,2050,R1,gassupply1,2030,10.89990000000 +2,2059,R1,gassupply1,2030,10.89990000000 +2,2060,R1,gassupply1,2030,10.89990000000 +2,2064,R1,gassupply1,2030,10.89990000000 +2,2065,R1,gassupply1,2030,10.89990000000 +2,2069,R1,gassupply1,2030,10.89990000000 +3,2040,R1,gassupply1,2035,0.01580000000 +3,2045,R1,gassupply1,2035,0.01580000000 +3,2050,R1,gassupply1,2035,0.01580000000 +3,2059,R1,gassupply1,2035,0.01580000000 +3,2060,R1,gassupply1,2035,0.01580000000 +3,2064,R1,gassupply1,2035,0.01580000000 +3,2065,R1,gassupply1,2035,0.01580000000 +3,2069,R1,gassupply1,2035,0.01580000000 +3,2070,R1,gassupply1,2035,0.01580000000 +3,2074,R1,gassupply1,2035,0.01580000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv index 235026caa..323910b3b 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv @@ -1,17 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,15.00000000000 -0,2030,R1,gassupply1,2020,7.50000000000 -1,2030,R1,gassupply1,2025,3.63330000000 -1,2035,R1,gassupply1,2025,3.63330000000 -1,2040,R1,gassupply1,2025,3.63330000000 -1,2045,R1,gassupply1,2025,3.63330000000 -1,2050,R1,gassupply1,2025,3.63330000000 -1,2064,R1,gassupply1,2025,3.63330000000 -2,2035,R1,gassupply1,2030,8.89170000000 -2,2040,R1,gassupply1,2030,8.89170000000 -2,2045,R1,gassupply1,2030,8.89170000000 -2,2050,R1,gassupply1,2030,8.89170000000 -2,2064,R1,gassupply1,2030,8.89170000000 -2,2065,R1,gassupply1,2030,8.89170000000 -2,2069,R1,gassupply1,2030,8.89170000000 +0,2025,R1,gassupply1,2020,19.46470000000 +0,2030,R1,gassupply1,2020,11.96470000000 +0,2035,R1,gassupply1,2020,4.46470000000 +0,2040,R1,gassupply1,2020,4.46470000000 +0,2045,R1,gassupply1,2020,4.46470000000 +0,2050,R1,gassupply1,2020,4.46470000000 +0,2059,R1,gassupply1,2020,4.46470000000 +1,2030,R1,gassupply1,2025,7.88760000000 +1,2035,R1,gassupply1,2025,7.88760000000 +1,2040,R1,gassupply1,2025,7.88760000000 +1,2045,R1,gassupply1,2025,7.88760000000 +1,2050,R1,gassupply1,2025,7.88760000000 +1,2059,R1,gassupply1,2025,7.88760000000 +1,2060,R1,gassupply1,2025,7.88760000000 +1,2064,R1,gassupply1,2025,7.88760000000 +2,2035,R1,gassupply1,2030,10.89990000000 +2,2040,R1,gassupply1,2030,10.89990000000 +2,2045,R1,gassupply1,2030,10.89990000000 +2,2050,R1,gassupply1,2030,10.89990000000 +2,2059,R1,gassupply1,2030,10.89990000000 +2,2060,R1,gassupply1,2030,10.89990000000 +2,2064,R1,gassupply1,2030,10.89990000000 +2,2065,R1,gassupply1,2030,10.89990000000 +2,2069,R1,gassupply1,2030,10.89990000000 +3,2040,R1,gassupply1,2035,0.01580000000 +3,2045,R1,gassupply1,2035,0.01580000000 +3,2050,R1,gassupply1,2035,0.01580000000 +3,2059,R1,gassupply1,2035,0.01580000000 +3,2060,R1,gassupply1,2035,0.01580000000 +3,2064,R1,gassupply1,2035,0.01580000000 +3,2065,R1,gassupply1,2035,0.01580000000 +3,2069,R1,gassupply1,2035,0.01580000000 +3,2070,R1,gassupply1,2035,0.01580000000 +3,2074,R1,gassupply1,2035,0.01580000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv index 28aff26e2..323910b3b 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv @@ -1,25 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,15.00000000000 -0,2030,R1,gassupply1,2020,7.50000000000 -1,2030,R1,gassupply1,2025,3.63330000000 -1,2035,R1,gassupply1,2025,3.63330000000 -1,2040,R1,gassupply1,2025,3.63330000000 -1,2045,R1,gassupply1,2025,3.63330000000 -1,2050,R1,gassupply1,2025,3.63330000000 -1,2055,R1,gassupply1,2025,3.63330000000 -1,2064,R1,gassupply1,2025,3.63330000000 -2,2035,R1,gassupply1,2030,8.89170000000 -2,2040,R1,gassupply1,2030,8.89170000000 -2,2045,R1,gassupply1,2030,8.89170000000 -2,2050,R1,gassupply1,2030,8.89170000000 -2,2055,R1,gassupply1,2030,8.89170000000 -2,2064,R1,gassupply1,2030,8.89170000000 -2,2065,R1,gassupply1,2030,8.89170000000 -2,2069,R1,gassupply1,2030,8.89170000000 -3,2055,R1,gassupply1,2050,0.41040000000 -3,2064,R1,gassupply1,2050,0.41040000000 -3,2065,R1,gassupply1,2050,0.41040000000 -3,2069,R1,gassupply1,2050,0.41040000000 -3,2070,R1,gassupply1,2050,0.41040000000 -3,2089,R1,gassupply1,2050,0.41040000000 +0,2025,R1,gassupply1,2020,19.46470000000 +0,2030,R1,gassupply1,2020,11.96470000000 +0,2035,R1,gassupply1,2020,4.46470000000 +0,2040,R1,gassupply1,2020,4.46470000000 +0,2045,R1,gassupply1,2020,4.46470000000 +0,2050,R1,gassupply1,2020,4.46470000000 +0,2059,R1,gassupply1,2020,4.46470000000 +1,2030,R1,gassupply1,2025,7.88760000000 +1,2035,R1,gassupply1,2025,7.88760000000 +1,2040,R1,gassupply1,2025,7.88760000000 +1,2045,R1,gassupply1,2025,7.88760000000 +1,2050,R1,gassupply1,2025,7.88760000000 +1,2059,R1,gassupply1,2025,7.88760000000 +1,2060,R1,gassupply1,2025,7.88760000000 +1,2064,R1,gassupply1,2025,7.88760000000 +2,2035,R1,gassupply1,2030,10.89990000000 +2,2040,R1,gassupply1,2030,10.89990000000 +2,2045,R1,gassupply1,2030,10.89990000000 +2,2050,R1,gassupply1,2030,10.89990000000 +2,2059,R1,gassupply1,2030,10.89990000000 +2,2060,R1,gassupply1,2030,10.89990000000 +2,2064,R1,gassupply1,2030,10.89990000000 +2,2065,R1,gassupply1,2030,10.89990000000 +2,2069,R1,gassupply1,2030,10.89990000000 +3,2040,R1,gassupply1,2035,0.01580000000 +3,2045,R1,gassupply1,2035,0.01580000000 +3,2050,R1,gassupply1,2035,0.01580000000 +3,2059,R1,gassupply1,2035,0.01580000000 +3,2060,R1,gassupply1,2035,0.01580000000 +3,2064,R1,gassupply1,2035,0.01580000000 +3,2065,R1,gassupply1,2035,0.01580000000 +3,2069,R1,gassupply1,2035,0.01580000000 +3,2070,R1,gassupply1,2035,0.01580000000 +3,2074,R1,gassupply1,2035,0.01580000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv index e3731c7f3..83eb617e2 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -7,97 +7,107 @@ A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,2.36110000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2030 -A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2030 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A2,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,0.50000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 -A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2035 -A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.10000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,0.34170000000,R1,2030,R1,power,solarPV,newcapa,2035 +A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2035 +A2,1.02500000000,R1,2030,R1,power,solarPV,newcapa,2035 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A2,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 +A2,1.10000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,0.50000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,2.50000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,0.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 -A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A2,3.50000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2040 -A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,0.34170000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,1.70830000000,R1,2035,R1,power,solarPV,newcapa,2040 +A1,0.65830000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2040 +A2,1.02500000000,R1,2030,R1,power,solarPV,newcapa,2040 +A2,2.86670000000,R1,2035,R1,power,solarPV,newcapa,2040 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,0.50000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,2.50000000000,R1,2035,R1,power,solarPV,newcapa,2045 -A1,3.25000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,0.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 -A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A2,3.50000000000,R1,2035,R1,power,solarPV,newcapa,2045 -A2,3.25000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2045 -A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.34170000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,1.70830000000,R1,2035,R1,power,solarPV,newcapa,2045 +A1,6.10000000000,R1,2040,R1,power,solarPV,newcapa,2045 +A1,0.65830000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2045 +A2,1.02500000000,R1,2030,R1,power,solarPV,newcapa,2045 +A2,2.86670000000,R1,2035,R1,power,solarPV,newcapa,2045 +A2,6.10000000000,R1,2040,R1,power,solarPV,newcapa,2045 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.50000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,2.50000000000,R1,2035,R1,power,solarPV,newcapa,2050 -A1,3.25000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.34170000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,1.70830000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.10000000000,R1,2040,R1,power,solarPV,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,0.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 -A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A2,3.50000000000,R1,2035,R1,power,solarPV,newcapa,2050 -A2,3.25000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A2,6.59370000000,R1,2045,R1,power,solarPV,newcapa,2050 -A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.65830000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2050 +A2,1.02500000000,R1,2030,R1,power,solarPV,newcapa,2050 +A2,2.86670000000,R1,2035,R1,power,solarPV,newcapa,2050 +A2,6.10000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A2,8.25630000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv index dda5e11e6..89aff9c4a 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,8.08020000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.98640000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.50340000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,6.60550000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,8.08020000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.98640000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.50340000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,6.60550000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,8.08020000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.98640000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.50340000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,6.60550000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,8.08020000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.98640000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.50340000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,6.60550000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,8.08020000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.98640000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.50340000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,6.60550000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,8.08020000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.98640000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.50340000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,6.60550000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,8.67020000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,8.67450000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,3.70860000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.95860000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,8.67020000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,8.67450000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,3.70860000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.95860000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,8.67020000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,8.67450000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,3.70860000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.95860000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,8.67020000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,8.67450000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,3.70860000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.95860000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,8.67020000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,8.67450000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.70860000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.95860000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,8.67020000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,8.67450000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,3.70860000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.95860000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,10.71580000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.71990000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,4.52680000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.70370000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,10.71580000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,10.71990000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,4.52680000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,7.70370000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,10.71580000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.71990000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,4.52680000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.70370000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,10.71580000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,10.71990000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,4.52680000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.70370000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,10.71580000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,10.71990000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,4.52680000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,7.70370000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,10.71580000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,10.71990000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.52680000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,7.70370000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,11.22800000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.94890000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,4.73170000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.33340000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,11.22800000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,10.94890000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,4.73170000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.33340000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,11.22800000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,10.94890000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,4.73170000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.33340000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,11.22800000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,10.94890000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,4.73170000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.33340000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,11.22800000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,10.94890000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,4.73170000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,8.33340000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,11.22800000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,10.94890000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.73170000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.33340000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,12.28600000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,9.91870000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,5.15490000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,4.20800000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,12.28600000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,9.91870000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.15490000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,4.20800000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,12.28600000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,9.91870000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,5.15490000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,4.20800000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,12.28600000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,9.91870000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.15490000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,4.20800000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,12.28600000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.91870000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.15490000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,4.20800000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,12.28600000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,9.91870000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,5.15490000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,4.20800000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,13.30680000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,9.81810000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.56320000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,4.16780000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,13.30680000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,9.81810000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.56320000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,4.16780000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,13.30680000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,9.81810000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.56320000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,4.16780000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,13.30680000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,9.81810000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.56320000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,4.16780000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,13.30680000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.81810000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.56320000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,4.16780000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,13.30680000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,9.81810000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.56320000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,4.16780000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv index 56b5af9dd..161a4e35a 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv @@ -1,16 +1,16 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,2.86110000000 -0,2030,R1,gasCCGT,2020,1.86110000000 -0,2035,R1,gasCCGT,2020,1.86110000000 -0,2040,R1,gasCCGT,2020,1.86110000000 -0,2045,R1,gasCCGT,2020,1.86110000000 -0,2049,R1,gasCCGT,2020,1.86110000000 -0,2050,R1,gasCCGT,2020,1.86110000000 -0,2059,R1,gasCCGT,2020,1.86110000000 -1,2025,R1,windturbine,2020,4.18750000000 -1,2030,R1,windturbine,2020,4.18750000000 -1,2035,R1,windturbine,2020,4.18750000000 -1,2040,R1,windturbine,2020,4.18750000000 -1,2045,R1,windturbine,2020,4.18750000000 -1,2049,R1,windturbine,2020,4.18750000000 +0,2025,R1,gasCCGT,2020,1.80560000000 +0,2030,R1,gasCCGT,2020,0.80560000000 +0,2035,R1,gasCCGT,2020,0.80560000000 +0,2040,R1,gasCCGT,2020,0.80560000000 +0,2045,R1,gasCCGT,2020,0.80560000000 +0,2049,R1,gasCCGT,2020,0.80560000000 +0,2050,R1,gasCCGT,2020,0.80560000000 +0,2059,R1,gasCCGT,2020,0.80560000000 +1,2025,R1,windturbine,2020,1.81250000000 +1,2030,R1,windturbine,2020,1.81250000000 +1,2035,R1,windturbine,2020,1.81250000000 +1,2040,R1,windturbine,2020,1.81250000000 +1,2045,R1,windturbine,2020,1.81250000000 +1,2049,R1,windturbine,2020,1.81250000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv index 0904cf428..f894db695 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv @@ -1,43 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,2.86110000000 -0,2030,R1,gasCCGT,2020,1.86110000000 -0,2035,R1,gasCCGT,2020,1.86110000000 -0,2040,R1,gasCCGT,2020,1.86110000000 -0,2045,R1,gasCCGT,2020,1.86110000000 -0,2049,R1,gasCCGT,2020,1.86110000000 -0,2050,R1,gasCCGT,2020,1.86110000000 -0,2054,R1,gasCCGT,2020,1.86110000000 -0,2055,R1,gasCCGT,2020,1.86110000000 -0,2059,R1,gasCCGT,2020,1.86110000000 -1,2030,R1,gasCCGT,2025,4.80560000000 -1,2035,R1,gasCCGT,2025,4.80560000000 -1,2040,R1,gasCCGT,2025,4.80560000000 -1,2045,R1,gasCCGT,2025,4.80560000000 -1,2049,R1,gasCCGT,2025,4.80560000000 -1,2050,R1,gasCCGT,2025,4.80560000000 -1,2054,R1,gasCCGT,2025,4.80560000000 -1,2055,R1,gasCCGT,2025,4.80560000000 -1,2059,R1,gasCCGT,2025,4.80560000000 -1,2060,R1,gasCCGT,2025,4.80560000000 -1,2064,R1,gasCCGT,2025,4.80560000000 -2,2030,R1,solarPV,2025,10.00000000000 -2,2035,R1,solarPV,2025,10.00000000000 -2,2040,R1,solarPV,2025,10.00000000000 -2,2045,R1,solarPV,2025,10.00000000000 -2,2049,R1,solarPV,2025,10.00000000000 -2,2050,R1,solarPV,2025,10.00000000000 -2,2054,R1,solarPV,2025,10.00000000000 -3,2025,R1,windturbine,2020,4.18750000000 -3,2030,R1,windturbine,2020,4.18750000000 -3,2035,R1,windturbine,2020,4.18750000000 -3,2040,R1,windturbine,2020,4.18750000000 -3,2045,R1,windturbine,2020,4.18750000000 -3,2049,R1,windturbine,2020,4.18750000000 -4,2030,R1,windturbine,2025,0.81250000000 -4,2035,R1,windturbine,2025,0.81250000000 -4,2040,R1,windturbine,2025,0.81250000000 -4,2045,R1,windturbine,2025,0.81250000000 -4,2049,R1,windturbine,2025,0.81250000000 -4,2050,R1,windturbine,2025,0.81250000000 -4,2054,R1,windturbine,2025,0.81250000000 +0,2025,R1,gasCCGT,2020,1.80560000000 +0,2030,R1,gasCCGT,2020,0.80560000000 +0,2035,R1,gasCCGT,2020,0.80560000000 +0,2040,R1,gasCCGT,2020,0.80560000000 +0,2045,R1,gasCCGT,2020,0.80560000000 +0,2049,R1,gasCCGT,2020,0.80560000000 +0,2050,R1,gasCCGT,2020,0.80560000000 +0,2054,R1,gasCCGT,2020,0.80560000000 +0,2055,R1,gasCCGT,2020,0.80560000000 +0,2059,R1,gasCCGT,2020,0.80560000000 +1,2030,R1,gasCCGT,2025,3.75000000000 +1,2035,R1,gasCCGT,2025,3.75000000000 +1,2040,R1,gasCCGT,2025,3.75000000000 +1,2045,R1,gasCCGT,2025,3.75000000000 +1,2049,R1,gasCCGT,2025,3.75000000000 +1,2050,R1,gasCCGT,2025,3.75000000000 +1,2054,R1,gasCCGT,2025,3.75000000000 +1,2055,R1,gasCCGT,2025,3.75000000000 +1,2059,R1,gasCCGT,2025,3.75000000000 +1,2060,R1,gasCCGT,2025,3.75000000000 +1,2064,R1,gasCCGT,2025,3.75000000000 +2,2030,R1,solarPV,2025,8.43750000000 +2,2035,R1,solarPV,2025,8.43750000000 +2,2040,R1,solarPV,2025,8.43750000000 +2,2045,R1,solarPV,2025,8.43750000000 +2,2049,R1,solarPV,2025,8.43750000000 +2,2050,R1,solarPV,2025,8.43750000000 +2,2054,R1,solarPV,2025,8.43750000000 +3,2025,R1,windturbine,2020,1.81250000000 +3,2030,R1,windturbine,2020,1.81250000000 +3,2035,R1,windturbine,2020,1.81250000000 +3,2040,R1,windturbine,2020,1.81250000000 +3,2045,R1,windturbine,2020,1.81250000000 +3,2049,R1,windturbine,2020,1.81250000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv index 791407470..b5cca37da 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv @@ -1,51 +1,44 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,2.86110000000 -0,2030,R1,gasCCGT,2020,1.86110000000 -0,2035,R1,gasCCGT,2020,1.86110000000 -0,2040,R1,gasCCGT,2020,1.86110000000 -0,2045,R1,gasCCGT,2020,1.86110000000 -0,2049,R1,gasCCGT,2020,1.86110000000 -0,2050,R1,gasCCGT,2020,1.86110000000 -0,2054,R1,gasCCGT,2020,1.86110000000 -0,2055,R1,gasCCGT,2020,1.86110000000 -0,2059,R1,gasCCGT,2020,1.86110000000 -1,2030,R1,gasCCGT,2025,4.80560000000 -1,2035,R1,gasCCGT,2025,4.80560000000 -1,2040,R1,gasCCGT,2025,4.80560000000 -1,2045,R1,gasCCGT,2025,4.80560000000 -1,2049,R1,gasCCGT,2025,4.80560000000 -1,2050,R1,gasCCGT,2025,4.80560000000 -1,2054,R1,gasCCGT,2025,4.80560000000 -1,2055,R1,gasCCGT,2025,4.80560000000 -1,2059,R1,gasCCGT,2025,4.80560000000 -1,2060,R1,gasCCGT,2025,4.80560000000 -1,2064,R1,gasCCGT,2025,4.80560000000 -2,2030,R1,solarPV,2025,10.00000000000 -2,2035,R1,solarPV,2025,10.00000000000 -2,2040,R1,solarPV,2025,10.00000000000 -2,2045,R1,solarPV,2025,10.00000000000 -2,2049,R1,solarPV,2025,10.00000000000 -2,2050,R1,solarPV,2025,10.00000000000 -2,2054,R1,solarPV,2025,10.00000000000 -3,2035,R1,solarPV,2030,2.00000000000 -3,2040,R1,solarPV,2030,2.00000000000 -3,2045,R1,solarPV,2030,2.00000000000 -3,2049,R1,solarPV,2030,2.00000000000 -3,2050,R1,solarPV,2030,2.00000000000 -3,2054,R1,solarPV,2030,2.00000000000 -3,2055,R1,solarPV,2030,2.00000000000 -3,2059,R1,solarPV,2030,2.00000000000 -4,2025,R1,windturbine,2020,4.18750000000 -4,2030,R1,windturbine,2020,4.18750000000 -4,2035,R1,windturbine,2020,4.18750000000 -4,2040,R1,windturbine,2020,4.18750000000 -4,2045,R1,windturbine,2020,4.18750000000 -4,2049,R1,windturbine,2020,4.18750000000 -5,2030,R1,windturbine,2025,0.81250000000 -5,2035,R1,windturbine,2025,0.81250000000 -5,2040,R1,windturbine,2025,0.81250000000 -5,2045,R1,windturbine,2025,0.81250000000 -5,2049,R1,windturbine,2025,0.81250000000 -5,2050,R1,windturbine,2025,0.81250000000 -5,2054,R1,windturbine,2025,0.81250000000 +0,2025,R1,gasCCGT,2020,1.80560000000 +0,2030,R1,gasCCGT,2020,0.80560000000 +0,2035,R1,gasCCGT,2020,0.80560000000 +0,2040,R1,gasCCGT,2020,0.80560000000 +0,2045,R1,gasCCGT,2020,0.80560000000 +0,2049,R1,gasCCGT,2020,0.80560000000 +0,2050,R1,gasCCGT,2020,0.80560000000 +0,2054,R1,gasCCGT,2020,0.80560000000 +0,2055,R1,gasCCGT,2020,0.80560000000 +0,2059,R1,gasCCGT,2020,0.80560000000 +1,2030,R1,gasCCGT,2025,3.75000000000 +1,2035,R1,gasCCGT,2025,3.75000000000 +1,2040,R1,gasCCGT,2025,3.75000000000 +1,2045,R1,gasCCGT,2025,3.75000000000 +1,2049,R1,gasCCGT,2025,3.75000000000 +1,2050,R1,gasCCGT,2025,3.75000000000 +1,2054,R1,gasCCGT,2025,3.75000000000 +1,2055,R1,gasCCGT,2025,3.75000000000 +1,2059,R1,gasCCGT,2025,3.75000000000 +1,2060,R1,gasCCGT,2025,3.75000000000 +1,2064,R1,gasCCGT,2025,3.75000000000 +2,2030,R1,solarPV,2025,8.43750000000 +2,2035,R1,solarPV,2025,8.43750000000 +2,2040,R1,solarPV,2025,8.43750000000 +2,2045,R1,solarPV,2025,8.43750000000 +2,2049,R1,solarPV,2025,8.43750000000 +2,2050,R1,solarPV,2025,8.43750000000 +2,2054,R1,solarPV,2025,8.43750000000 +3,2035,R1,solarPV,2030,1.36670000000 +3,2040,R1,solarPV,2030,1.36670000000 +3,2045,R1,solarPV,2030,1.36670000000 +3,2049,R1,solarPV,2030,1.36670000000 +3,2050,R1,solarPV,2030,1.36670000000 +3,2054,R1,solarPV,2030,1.36670000000 +3,2055,R1,solarPV,2030,1.36670000000 +3,2059,R1,solarPV,2030,1.36670000000 +4,2025,R1,windturbine,2020,1.81250000000 +4,2030,R1,windturbine,2020,1.81250000000 +4,2035,R1,windturbine,2020,1.81250000000 +4,2040,R1,windturbine,2020,1.81250000000 +4,2045,R1,windturbine,2020,1.81250000000 +4,2049,R1,windturbine,2020,1.81250000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv index edc23870a..3e7000cd4 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv @@ -1,69 +1,62 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,2.86110000000 -0,2030,R1,gasCCGT,2020,1.86110000000 -0,2035,R1,gasCCGT,2020,1.86110000000 -0,2040,R1,gasCCGT,2020,1.86110000000 -0,2045,R1,gasCCGT,2020,1.86110000000 -0,2049,R1,gasCCGT,2020,1.86110000000 -0,2050,R1,gasCCGT,2020,1.86110000000 -0,2054,R1,gasCCGT,2020,1.86110000000 -0,2055,R1,gasCCGT,2020,1.86110000000 -0,2059,R1,gasCCGT,2020,1.86110000000 -1,2030,R1,gasCCGT,2025,4.80560000000 -1,2035,R1,gasCCGT,2025,4.80560000000 -1,2040,R1,gasCCGT,2025,4.80560000000 -1,2045,R1,gasCCGT,2025,4.80560000000 -1,2049,R1,gasCCGT,2025,4.80560000000 -1,2050,R1,gasCCGT,2025,4.80560000000 -1,2054,R1,gasCCGT,2025,4.80560000000 -1,2055,R1,gasCCGT,2025,4.80560000000 -1,2059,R1,gasCCGT,2025,4.80560000000 -1,2060,R1,gasCCGT,2025,4.80560000000 -1,2064,R1,gasCCGT,2025,4.80560000000 -2,2030,R1,solarPV,2025,10.00000000000 -2,2035,R1,solarPV,2025,10.00000000000 -2,2040,R1,solarPV,2025,10.00000000000 -2,2045,R1,solarPV,2025,10.00000000000 -2,2049,R1,solarPV,2025,10.00000000000 -2,2050,R1,solarPV,2025,10.00000000000 -2,2054,R1,solarPV,2025,10.00000000000 -3,2035,R1,solarPV,2030,2.00000000000 -3,2040,R1,solarPV,2030,2.00000000000 -3,2045,R1,solarPV,2030,2.00000000000 -3,2049,R1,solarPV,2030,2.00000000000 -3,2050,R1,solarPV,2030,2.00000000000 -3,2054,R1,solarPV,2030,2.00000000000 -3,2055,R1,solarPV,2030,2.00000000000 -3,2059,R1,solarPV,2030,2.00000000000 -4,2040,R1,solarPV,2035,6.00000000000 -4,2045,R1,solarPV,2035,6.00000000000 -4,2049,R1,solarPV,2035,6.00000000000 -4,2050,R1,solarPV,2035,6.00000000000 -4,2054,R1,solarPV,2035,6.00000000000 -4,2055,R1,solarPV,2035,6.00000000000 -4,2059,R1,solarPV,2035,6.00000000000 -4,2060,R1,solarPV,2035,6.00000000000 -4,2064,R1,solarPV,2035,6.00000000000 -5,2025,R1,windturbine,2020,4.18750000000 -5,2030,R1,windturbine,2020,4.18750000000 -5,2035,R1,windturbine,2020,4.18750000000 -5,2040,R1,windturbine,2020,4.18750000000 -5,2045,R1,windturbine,2020,4.18750000000 -5,2049,R1,windturbine,2020,4.18750000000 -6,2030,R1,windturbine,2025,0.81250000000 -6,2035,R1,windturbine,2025,0.81250000000 -6,2040,R1,windturbine,2025,0.81250000000 -6,2045,R1,windturbine,2025,0.81250000000 -6,2049,R1,windturbine,2025,0.81250000000 -6,2050,R1,windturbine,2025,0.81250000000 -6,2054,R1,windturbine,2025,0.81250000000 -7,2040,R1,windturbine,2035,0.50000000000 -7,2045,R1,windturbine,2035,0.50000000000 -7,2049,R1,windturbine,2035,0.50000000000 -7,2050,R1,windturbine,2035,0.50000000000 -7,2054,R1,windturbine,2035,0.50000000000 -7,2055,R1,windturbine,2035,0.50000000000 -7,2059,R1,windturbine,2035,0.50000000000 -7,2060,R1,windturbine,2035,0.50000000000 -7,2064,R1,windturbine,2035,0.50000000000 +0,2025,R1,gasCCGT,2020,1.80560000000 +0,2030,R1,gasCCGT,2020,0.80560000000 +0,2035,R1,gasCCGT,2020,0.80560000000 +0,2040,R1,gasCCGT,2020,0.80560000000 +0,2045,R1,gasCCGT,2020,0.80560000000 +0,2049,R1,gasCCGT,2020,0.80560000000 +0,2050,R1,gasCCGT,2020,0.80560000000 +0,2054,R1,gasCCGT,2020,0.80560000000 +0,2055,R1,gasCCGT,2020,0.80560000000 +0,2059,R1,gasCCGT,2020,0.80560000000 +1,2030,R1,gasCCGT,2025,3.75000000000 +1,2035,R1,gasCCGT,2025,3.75000000000 +1,2040,R1,gasCCGT,2025,3.75000000000 +1,2045,R1,gasCCGT,2025,3.75000000000 +1,2049,R1,gasCCGT,2025,3.75000000000 +1,2050,R1,gasCCGT,2025,3.75000000000 +1,2054,R1,gasCCGT,2025,3.75000000000 +1,2055,R1,gasCCGT,2025,3.75000000000 +1,2059,R1,gasCCGT,2025,3.75000000000 +1,2060,R1,gasCCGT,2025,3.75000000000 +1,2064,R1,gasCCGT,2025,3.75000000000 +2,2030,R1,solarPV,2025,8.43750000000 +2,2035,R1,solarPV,2025,8.43750000000 +2,2040,R1,solarPV,2025,8.43750000000 +2,2045,R1,solarPV,2025,8.43750000000 +2,2049,R1,solarPV,2025,8.43750000000 +2,2050,R1,solarPV,2025,8.43750000000 +2,2054,R1,solarPV,2025,8.43750000000 +3,2035,R1,solarPV,2030,1.36670000000 +3,2040,R1,solarPV,2030,1.36670000000 +3,2045,R1,solarPV,2030,1.36670000000 +3,2049,R1,solarPV,2030,1.36670000000 +3,2050,R1,solarPV,2030,1.36670000000 +3,2054,R1,solarPV,2030,1.36670000000 +3,2055,R1,solarPV,2030,1.36670000000 +3,2059,R1,solarPV,2030,1.36670000000 +4,2040,R1,solarPV,2035,4.57500000000 +4,2045,R1,solarPV,2035,4.57500000000 +4,2049,R1,solarPV,2035,4.57500000000 +4,2050,R1,solarPV,2035,4.57500000000 +4,2054,R1,solarPV,2035,4.57500000000 +4,2055,R1,solarPV,2035,4.57500000000 +4,2059,R1,solarPV,2035,4.57500000000 +4,2060,R1,solarPV,2035,4.57500000000 +4,2064,R1,solarPV,2035,4.57500000000 +5,2025,R1,windturbine,2020,1.81250000000 +5,2030,R1,windturbine,2020,1.81250000000 +5,2035,R1,windturbine,2020,1.81250000000 +5,2040,R1,windturbine,2020,1.81250000000 +5,2045,R1,windturbine,2020,1.81250000000 +5,2049,R1,windturbine,2020,1.81250000000 +6,2040,R1,windturbine,2035,0.65830000000 +6,2045,R1,windturbine,2035,0.65830000000 +6,2049,R1,windturbine,2035,0.65830000000 +6,2050,R1,windturbine,2035,0.65830000000 +6,2054,R1,windturbine,2035,0.65830000000 +6,2055,R1,windturbine,2035,0.65830000000 +6,2059,R1,windturbine,2035,0.65830000000 +6,2060,R1,windturbine,2035,0.65830000000 +6,2064,R1,windturbine,2035,0.65830000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv index a7d7b331a..5d49eeed1 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv @@ -1,79 +1,72 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,2.86110000000 -0,2030,R1,gasCCGT,2020,1.86110000000 -0,2035,R1,gasCCGT,2020,1.86110000000 -0,2040,R1,gasCCGT,2020,1.86110000000 -0,2045,R1,gasCCGT,2020,1.86110000000 -0,2049,R1,gasCCGT,2020,1.86110000000 -0,2050,R1,gasCCGT,2020,1.86110000000 -0,2054,R1,gasCCGT,2020,1.86110000000 -0,2055,R1,gasCCGT,2020,1.86110000000 -0,2059,R1,gasCCGT,2020,1.86110000000 -1,2030,R1,gasCCGT,2025,4.80560000000 -1,2035,R1,gasCCGT,2025,4.80560000000 -1,2040,R1,gasCCGT,2025,4.80560000000 -1,2045,R1,gasCCGT,2025,4.80560000000 -1,2049,R1,gasCCGT,2025,4.80560000000 -1,2050,R1,gasCCGT,2025,4.80560000000 -1,2054,R1,gasCCGT,2025,4.80560000000 -1,2055,R1,gasCCGT,2025,4.80560000000 -1,2059,R1,gasCCGT,2025,4.80560000000 -1,2060,R1,gasCCGT,2025,4.80560000000 -1,2064,R1,gasCCGT,2025,4.80560000000 -2,2030,R1,solarPV,2025,10.00000000000 -2,2035,R1,solarPV,2025,10.00000000000 -2,2040,R1,solarPV,2025,10.00000000000 -2,2045,R1,solarPV,2025,10.00000000000 -2,2049,R1,solarPV,2025,10.00000000000 -2,2050,R1,solarPV,2025,10.00000000000 -2,2054,R1,solarPV,2025,10.00000000000 -3,2035,R1,solarPV,2030,2.00000000000 -3,2040,R1,solarPV,2030,2.00000000000 -3,2045,R1,solarPV,2030,2.00000000000 -3,2049,R1,solarPV,2030,2.00000000000 -3,2050,R1,solarPV,2030,2.00000000000 -3,2054,R1,solarPV,2030,2.00000000000 -3,2055,R1,solarPV,2030,2.00000000000 -3,2059,R1,solarPV,2030,2.00000000000 -4,2040,R1,solarPV,2035,6.00000000000 -4,2045,R1,solarPV,2035,6.00000000000 -4,2049,R1,solarPV,2035,6.00000000000 -4,2050,R1,solarPV,2035,6.00000000000 -4,2054,R1,solarPV,2035,6.00000000000 -4,2055,R1,solarPV,2035,6.00000000000 -4,2059,R1,solarPV,2035,6.00000000000 -4,2060,R1,solarPV,2035,6.00000000000 -4,2064,R1,solarPV,2035,6.00000000000 -5,2045,R1,solarPV,2040,6.50000000000 -5,2049,R1,solarPV,2040,6.50000000000 -5,2050,R1,solarPV,2040,6.50000000000 -5,2054,R1,solarPV,2040,6.50000000000 -5,2055,R1,solarPV,2040,6.50000000000 -5,2059,R1,solarPV,2040,6.50000000000 -5,2060,R1,solarPV,2040,6.50000000000 -5,2064,R1,solarPV,2040,6.50000000000 -5,2065,R1,solarPV,2040,6.50000000000 -5,2069,R1,solarPV,2040,6.50000000000 -6,2025,R1,windturbine,2020,4.18750000000 -6,2030,R1,windturbine,2020,4.18750000000 -6,2035,R1,windturbine,2020,4.18750000000 -6,2040,R1,windturbine,2020,4.18750000000 -6,2045,R1,windturbine,2020,4.18750000000 -6,2049,R1,windturbine,2020,4.18750000000 -7,2030,R1,windturbine,2025,0.81250000000 -7,2035,R1,windturbine,2025,0.81250000000 -7,2040,R1,windturbine,2025,0.81250000000 -7,2045,R1,windturbine,2025,0.81250000000 -7,2049,R1,windturbine,2025,0.81250000000 -7,2050,R1,windturbine,2025,0.81250000000 -7,2054,R1,windturbine,2025,0.81250000000 -8,2040,R1,windturbine,2035,0.50000000000 -8,2045,R1,windturbine,2035,0.50000000000 -8,2049,R1,windturbine,2035,0.50000000000 -8,2050,R1,windturbine,2035,0.50000000000 -8,2054,R1,windturbine,2035,0.50000000000 -8,2055,R1,windturbine,2035,0.50000000000 -8,2059,R1,windturbine,2035,0.50000000000 -8,2060,R1,windturbine,2035,0.50000000000 -8,2064,R1,windturbine,2035,0.50000000000 +0,2025,R1,gasCCGT,2020,1.80560000000 +0,2030,R1,gasCCGT,2020,0.80560000000 +0,2035,R1,gasCCGT,2020,0.80560000000 +0,2040,R1,gasCCGT,2020,0.80560000000 +0,2045,R1,gasCCGT,2020,0.80560000000 +0,2049,R1,gasCCGT,2020,0.80560000000 +0,2050,R1,gasCCGT,2020,0.80560000000 +0,2054,R1,gasCCGT,2020,0.80560000000 +0,2055,R1,gasCCGT,2020,0.80560000000 +0,2059,R1,gasCCGT,2020,0.80560000000 +1,2030,R1,gasCCGT,2025,3.75000000000 +1,2035,R1,gasCCGT,2025,3.75000000000 +1,2040,R1,gasCCGT,2025,3.75000000000 +1,2045,R1,gasCCGT,2025,3.75000000000 +1,2049,R1,gasCCGT,2025,3.75000000000 +1,2050,R1,gasCCGT,2025,3.75000000000 +1,2054,R1,gasCCGT,2025,3.75000000000 +1,2055,R1,gasCCGT,2025,3.75000000000 +1,2059,R1,gasCCGT,2025,3.75000000000 +1,2060,R1,gasCCGT,2025,3.75000000000 +1,2064,R1,gasCCGT,2025,3.75000000000 +2,2030,R1,solarPV,2025,8.43750000000 +2,2035,R1,solarPV,2025,8.43750000000 +2,2040,R1,solarPV,2025,8.43750000000 +2,2045,R1,solarPV,2025,8.43750000000 +2,2049,R1,solarPV,2025,8.43750000000 +2,2050,R1,solarPV,2025,8.43750000000 +2,2054,R1,solarPV,2025,8.43750000000 +3,2035,R1,solarPV,2030,1.36670000000 +3,2040,R1,solarPV,2030,1.36670000000 +3,2045,R1,solarPV,2030,1.36670000000 +3,2049,R1,solarPV,2030,1.36670000000 +3,2050,R1,solarPV,2030,1.36670000000 +3,2054,R1,solarPV,2030,1.36670000000 +3,2055,R1,solarPV,2030,1.36670000000 +3,2059,R1,solarPV,2030,1.36670000000 +4,2040,R1,solarPV,2035,4.57500000000 +4,2045,R1,solarPV,2035,4.57500000000 +4,2049,R1,solarPV,2035,4.57500000000 +4,2050,R1,solarPV,2035,4.57500000000 +4,2054,R1,solarPV,2035,4.57500000000 +4,2055,R1,solarPV,2035,4.57500000000 +4,2059,R1,solarPV,2035,4.57500000000 +4,2060,R1,solarPV,2035,4.57500000000 +4,2064,R1,solarPV,2035,4.57500000000 +5,2045,R1,solarPV,2040,12.20000000000 +5,2049,R1,solarPV,2040,12.20000000000 +5,2050,R1,solarPV,2040,12.20000000000 +5,2054,R1,solarPV,2040,12.20000000000 +5,2055,R1,solarPV,2040,12.20000000000 +5,2059,R1,solarPV,2040,12.20000000000 +5,2060,R1,solarPV,2040,12.20000000000 +5,2064,R1,solarPV,2040,12.20000000000 +5,2065,R1,solarPV,2040,12.20000000000 +5,2069,R1,solarPV,2040,12.20000000000 +6,2025,R1,windturbine,2020,1.81250000000 +6,2030,R1,windturbine,2020,1.81250000000 +6,2035,R1,windturbine,2020,1.81250000000 +6,2040,R1,windturbine,2020,1.81250000000 +6,2045,R1,windturbine,2020,1.81250000000 +6,2049,R1,windturbine,2020,1.81250000000 +7,2040,R1,windturbine,2035,0.65830000000 +7,2045,R1,windturbine,2035,0.65830000000 +7,2049,R1,windturbine,2035,0.65830000000 +7,2050,R1,windturbine,2035,0.65830000000 +7,2054,R1,windturbine,2035,0.65830000000 +7,2055,R1,windturbine,2035,0.65830000000 +7,2059,R1,windturbine,2035,0.65830000000 +7,2060,R1,windturbine,2035,0.65830000000 +7,2064,R1,windturbine,2035,0.65830000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv index a1ea9d794..3577f73cd 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv @@ -1,90 +1,83 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,2.86110000000 -0,2030,R1,gasCCGT,2020,1.86110000000 -0,2035,R1,gasCCGT,2020,1.86110000000 -0,2040,R1,gasCCGT,2020,1.86110000000 -0,2045,R1,gasCCGT,2020,1.86110000000 -0,2049,R1,gasCCGT,2020,1.86110000000 -0,2050,R1,gasCCGT,2020,1.86110000000 -0,2054,R1,gasCCGT,2020,1.86110000000 -0,2055,R1,gasCCGT,2020,1.86110000000 -0,2059,R1,gasCCGT,2020,1.86110000000 -1,2030,R1,gasCCGT,2025,4.80560000000 -1,2035,R1,gasCCGT,2025,4.80560000000 -1,2040,R1,gasCCGT,2025,4.80560000000 -1,2045,R1,gasCCGT,2025,4.80560000000 -1,2049,R1,gasCCGT,2025,4.80560000000 -1,2050,R1,gasCCGT,2025,4.80560000000 -1,2054,R1,gasCCGT,2025,4.80560000000 -1,2055,R1,gasCCGT,2025,4.80560000000 -1,2059,R1,gasCCGT,2025,4.80560000000 -1,2060,R1,gasCCGT,2025,4.80560000000 -1,2064,R1,gasCCGT,2025,4.80560000000 -2,2030,R1,solarPV,2025,10.00000000000 -2,2035,R1,solarPV,2025,10.00000000000 -2,2040,R1,solarPV,2025,10.00000000000 -2,2045,R1,solarPV,2025,10.00000000000 -2,2049,R1,solarPV,2025,10.00000000000 -2,2050,R1,solarPV,2025,10.00000000000 -2,2054,R1,solarPV,2025,10.00000000000 -3,2035,R1,solarPV,2030,2.00000000000 -3,2040,R1,solarPV,2030,2.00000000000 -3,2045,R1,solarPV,2030,2.00000000000 -3,2049,R1,solarPV,2030,2.00000000000 -3,2050,R1,solarPV,2030,2.00000000000 -3,2054,R1,solarPV,2030,2.00000000000 -3,2055,R1,solarPV,2030,2.00000000000 -3,2059,R1,solarPV,2030,2.00000000000 -4,2040,R1,solarPV,2035,6.00000000000 -4,2045,R1,solarPV,2035,6.00000000000 -4,2049,R1,solarPV,2035,6.00000000000 -4,2050,R1,solarPV,2035,6.00000000000 -4,2054,R1,solarPV,2035,6.00000000000 -4,2055,R1,solarPV,2035,6.00000000000 -4,2059,R1,solarPV,2035,6.00000000000 -4,2060,R1,solarPV,2035,6.00000000000 -4,2064,R1,solarPV,2035,6.00000000000 -5,2045,R1,solarPV,2040,6.50000000000 -5,2049,R1,solarPV,2040,6.50000000000 -5,2050,R1,solarPV,2040,6.50000000000 -5,2054,R1,solarPV,2040,6.50000000000 -5,2055,R1,solarPV,2040,6.50000000000 -5,2059,R1,solarPV,2040,6.50000000000 -5,2060,R1,solarPV,2040,6.50000000000 -5,2064,R1,solarPV,2040,6.50000000000 -5,2065,R1,solarPV,2040,6.50000000000 -5,2069,R1,solarPV,2040,6.50000000000 +0,2025,R1,gasCCGT,2020,1.80560000000 +0,2030,R1,gasCCGT,2020,0.80560000000 +0,2035,R1,gasCCGT,2020,0.80560000000 +0,2040,R1,gasCCGT,2020,0.80560000000 +0,2045,R1,gasCCGT,2020,0.80560000000 +0,2049,R1,gasCCGT,2020,0.80560000000 +0,2050,R1,gasCCGT,2020,0.80560000000 +0,2054,R1,gasCCGT,2020,0.80560000000 +0,2055,R1,gasCCGT,2020,0.80560000000 +0,2059,R1,gasCCGT,2020,0.80560000000 +1,2030,R1,gasCCGT,2025,3.75000000000 +1,2035,R1,gasCCGT,2025,3.75000000000 +1,2040,R1,gasCCGT,2025,3.75000000000 +1,2045,R1,gasCCGT,2025,3.75000000000 +1,2049,R1,gasCCGT,2025,3.75000000000 +1,2050,R1,gasCCGT,2025,3.75000000000 +1,2054,R1,gasCCGT,2025,3.75000000000 +1,2055,R1,gasCCGT,2025,3.75000000000 +1,2059,R1,gasCCGT,2025,3.75000000000 +1,2060,R1,gasCCGT,2025,3.75000000000 +1,2064,R1,gasCCGT,2025,3.75000000000 +2,2030,R1,solarPV,2025,8.43750000000 +2,2035,R1,solarPV,2025,8.43750000000 +2,2040,R1,solarPV,2025,8.43750000000 +2,2045,R1,solarPV,2025,8.43750000000 +2,2049,R1,solarPV,2025,8.43750000000 +2,2050,R1,solarPV,2025,8.43750000000 +2,2054,R1,solarPV,2025,8.43750000000 +3,2035,R1,solarPV,2030,1.36670000000 +3,2040,R1,solarPV,2030,1.36670000000 +3,2045,R1,solarPV,2030,1.36670000000 +3,2049,R1,solarPV,2030,1.36670000000 +3,2050,R1,solarPV,2030,1.36670000000 +3,2054,R1,solarPV,2030,1.36670000000 +3,2055,R1,solarPV,2030,1.36670000000 +3,2059,R1,solarPV,2030,1.36670000000 +4,2040,R1,solarPV,2035,4.57500000000 +4,2045,R1,solarPV,2035,4.57500000000 +4,2049,R1,solarPV,2035,4.57500000000 +4,2050,R1,solarPV,2035,4.57500000000 +4,2054,R1,solarPV,2035,4.57500000000 +4,2055,R1,solarPV,2035,4.57500000000 +4,2059,R1,solarPV,2035,4.57500000000 +4,2060,R1,solarPV,2035,4.57500000000 +4,2064,R1,solarPV,2035,4.57500000000 +5,2045,R1,solarPV,2040,12.20000000000 +5,2049,R1,solarPV,2040,12.20000000000 +5,2050,R1,solarPV,2040,12.20000000000 +5,2054,R1,solarPV,2040,12.20000000000 +5,2055,R1,solarPV,2040,12.20000000000 +5,2059,R1,solarPV,2040,12.20000000000 +5,2060,R1,solarPV,2040,12.20000000000 +5,2064,R1,solarPV,2040,12.20000000000 +5,2065,R1,solarPV,2040,12.20000000000 +5,2069,R1,solarPV,2040,12.20000000000 6,2049,R1,solarPV,2045,2.40000000000 -6,2050,R1,solarPV,2045,9.59380000000 -6,2054,R1,solarPV,2045,9.59380000000 -6,2055,R1,solarPV,2045,9.59380000000 -6,2059,R1,solarPV,2045,9.59380000000 -6,2060,R1,solarPV,2045,9.59380000000 -6,2064,R1,solarPV,2045,9.59380000000 -6,2065,R1,solarPV,2045,9.59380000000 -6,2069,R1,solarPV,2045,9.59380000000 -6,2070,R1,solarPV,2045,9.59380000000 -6,2074,R1,solarPV,2045,9.59380000000 -7,2025,R1,windturbine,2020,4.18750000000 -7,2030,R1,windturbine,2020,4.18750000000 -7,2035,R1,windturbine,2020,4.18750000000 -7,2040,R1,windturbine,2020,4.18750000000 -7,2045,R1,windturbine,2020,4.18750000000 -7,2049,R1,windturbine,2020,4.18750000000 -8,2030,R1,windturbine,2025,0.81250000000 -8,2035,R1,windturbine,2025,0.81250000000 -8,2040,R1,windturbine,2025,0.81250000000 -8,2045,R1,windturbine,2025,0.81250000000 -8,2049,R1,windturbine,2025,0.81250000000 -8,2050,R1,windturbine,2025,0.81250000000 -8,2054,R1,windturbine,2025,0.81250000000 -9,2040,R1,windturbine,2035,0.50000000000 -9,2045,R1,windturbine,2035,0.50000000000 -9,2049,R1,windturbine,2035,0.50000000000 -9,2050,R1,windturbine,2035,0.50000000000 -9,2054,R1,windturbine,2035,0.50000000000 -9,2055,R1,windturbine,2035,0.50000000000 -9,2059,R1,windturbine,2035,0.50000000000 -9,2060,R1,windturbine,2035,0.50000000000 -9,2064,R1,windturbine,2035,0.50000000000 +6,2050,R1,solarPV,2045,11.25630000000 +6,2054,R1,solarPV,2045,11.25630000000 +6,2055,R1,solarPV,2045,11.25630000000 +6,2059,R1,solarPV,2045,11.25630000000 +6,2060,R1,solarPV,2045,11.25630000000 +6,2064,R1,solarPV,2045,11.25630000000 +6,2065,R1,solarPV,2045,11.25630000000 +6,2069,R1,solarPV,2045,11.25630000000 +6,2070,R1,solarPV,2045,11.25630000000 +6,2074,R1,solarPV,2045,11.25630000000 +7,2025,R1,windturbine,2020,1.81250000000 +7,2030,R1,windturbine,2020,1.81250000000 +7,2035,R1,windturbine,2020,1.81250000000 +7,2040,R1,windturbine,2020,1.81250000000 +7,2045,R1,windturbine,2020,1.81250000000 +7,2049,R1,windturbine,2020,1.81250000000 +8,2040,R1,windturbine,2035,0.65830000000 +8,2045,R1,windturbine,2035,0.65830000000 +8,2049,R1,windturbine,2035,0.65830000000 +8,2050,R1,windturbine,2035,0.65830000000 +8,2054,R1,windturbine,2035,0.65830000000 +8,2055,R1,windturbine,2035,0.65830000000 +8,2059,R1,windturbine,2035,0.65830000000 +8,2060,R1,windturbine,2035,0.65830000000 +8,2064,R1,windturbine,2035,0.65830000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv index 73e8eaa40..b8a792346 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv @@ -1,122 +1,103 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,2.86110000000 -0,2030,R1,gasCCGT,2020,1.86110000000 -0,2035,R1,gasCCGT,2020,1.86110000000 -0,2040,R1,gasCCGT,2020,1.86110000000 -0,2045,R1,gasCCGT,2020,1.86110000000 -0,2049,R1,gasCCGT,2020,1.86110000000 -0,2050,R1,gasCCGT,2020,1.86110000000 -0,2054,R1,gasCCGT,2020,1.86110000000 -0,2055,R1,gasCCGT,2020,1.86110000000 -0,2059,R1,gasCCGT,2020,1.86110000000 -1,2030,R1,gasCCGT,2025,4.80560000000 -1,2035,R1,gasCCGT,2025,4.80560000000 -1,2040,R1,gasCCGT,2025,4.80560000000 -1,2045,R1,gasCCGT,2025,4.80560000000 -1,2049,R1,gasCCGT,2025,4.80560000000 -1,2050,R1,gasCCGT,2025,4.80560000000 -1,2054,R1,gasCCGT,2025,4.80560000000 -1,2055,R1,gasCCGT,2025,4.80560000000 -1,2059,R1,gasCCGT,2025,4.80560000000 -1,2060,R1,gasCCGT,2025,4.80560000000 -1,2064,R1,gasCCGT,2025,4.80560000000 -2,2055,R1,gasCCGT,2050,2.09030000000 -2,2059,R1,gasCCGT,2050,2.09030000000 -2,2060,R1,gasCCGT,2050,2.09030000000 -2,2064,R1,gasCCGT,2050,2.09030000000 -2,2065,R1,gasCCGT,2050,2.09030000000 -2,2069,R1,gasCCGT,2050,2.09030000000 -2,2070,R1,gasCCGT,2050,2.09030000000 -2,2074,R1,gasCCGT,2050,2.09030000000 -2,2075,R1,gasCCGT,2050,2.09030000000 -2,2079,R1,gasCCGT,2050,2.09030000000 -2,2080,R1,gasCCGT,2050,2.09030000000 -2,2089,R1,gasCCGT,2050,2.09030000000 -3,2030,R1,solarPV,2025,10.00000000000 -3,2035,R1,solarPV,2025,10.00000000000 -3,2040,R1,solarPV,2025,10.00000000000 -3,2045,R1,solarPV,2025,10.00000000000 -3,2049,R1,solarPV,2025,10.00000000000 -3,2050,R1,solarPV,2025,10.00000000000 -3,2054,R1,solarPV,2025,10.00000000000 -4,2035,R1,solarPV,2030,2.00000000000 -4,2040,R1,solarPV,2030,2.00000000000 -4,2045,R1,solarPV,2030,2.00000000000 -4,2049,R1,solarPV,2030,2.00000000000 -4,2050,R1,solarPV,2030,2.00000000000 -4,2054,R1,solarPV,2030,2.00000000000 -4,2055,R1,solarPV,2030,2.00000000000 -4,2059,R1,solarPV,2030,2.00000000000 -5,2040,R1,solarPV,2035,6.00000000000 -5,2045,R1,solarPV,2035,6.00000000000 -5,2049,R1,solarPV,2035,6.00000000000 -5,2050,R1,solarPV,2035,6.00000000000 -5,2054,R1,solarPV,2035,6.00000000000 -5,2055,R1,solarPV,2035,6.00000000000 -5,2059,R1,solarPV,2035,6.00000000000 -5,2060,R1,solarPV,2035,6.00000000000 -5,2064,R1,solarPV,2035,6.00000000000 -6,2045,R1,solarPV,2040,6.50000000000 -6,2049,R1,solarPV,2040,6.50000000000 -6,2050,R1,solarPV,2040,6.50000000000 -6,2054,R1,solarPV,2040,6.50000000000 -6,2055,R1,solarPV,2040,6.50000000000 -6,2059,R1,solarPV,2040,6.50000000000 -6,2060,R1,solarPV,2040,6.50000000000 -6,2064,R1,solarPV,2040,6.50000000000 -6,2065,R1,solarPV,2040,6.50000000000 -6,2069,R1,solarPV,2040,6.50000000000 -7,2049,R1,solarPV,2045,2.40000000000 -7,2050,R1,solarPV,2045,9.59380000000 -7,2054,R1,solarPV,2045,9.59380000000 -7,2055,R1,solarPV,2045,9.59380000000 -7,2059,R1,solarPV,2045,9.59380000000 -7,2060,R1,solarPV,2045,9.59380000000 -7,2064,R1,solarPV,2045,9.59380000000 -7,2065,R1,solarPV,2045,9.59380000000 -7,2069,R1,solarPV,2045,9.59380000000 -7,2070,R1,solarPV,2045,9.59380000000 -7,2074,R1,solarPV,2045,9.59380000000 -8,2055,R1,solarPV,2050,10.00000000000 -8,2059,R1,solarPV,2050,10.00000000000 -8,2060,R1,solarPV,2050,10.00000000000 -8,2064,R1,solarPV,2050,10.00000000000 -8,2065,R1,solarPV,2050,10.00000000000 -8,2069,R1,solarPV,2050,10.00000000000 -8,2070,R1,solarPV,2050,10.00000000000 -8,2074,R1,solarPV,2050,10.00000000000 -8,2075,R1,solarPV,2050,10.00000000000 -8,2079,R1,solarPV,2050,10.00000000000 -9,2025,R1,windturbine,2020,4.18750000000 -9,2030,R1,windturbine,2020,4.18750000000 -9,2035,R1,windturbine,2020,4.18750000000 -9,2040,R1,windturbine,2020,4.18750000000 -9,2045,R1,windturbine,2020,4.18750000000 -9,2049,R1,windturbine,2020,4.18750000000 -10,2030,R1,windturbine,2025,0.81250000000 -10,2035,R1,windturbine,2025,0.81250000000 -10,2040,R1,windturbine,2025,0.81250000000 -10,2045,R1,windturbine,2025,0.81250000000 -10,2049,R1,windturbine,2025,0.81250000000 -10,2050,R1,windturbine,2025,0.81250000000 -10,2054,R1,windturbine,2025,0.81250000000 -11,2040,R1,windturbine,2035,0.50000000000 -11,2045,R1,windturbine,2035,0.50000000000 -11,2049,R1,windturbine,2035,0.50000000000 -11,2050,R1,windturbine,2035,0.50000000000 -11,2054,R1,windturbine,2035,0.50000000000 -11,2055,R1,windturbine,2035,0.50000000000 -11,2059,R1,windturbine,2035,0.50000000000 -11,2060,R1,windturbine,2035,0.50000000000 -11,2064,R1,windturbine,2035,0.50000000000 -12,2055,R1,windturbine,2050,4.87500000000 -12,2059,R1,windturbine,2050,4.87500000000 -12,2060,R1,windturbine,2050,4.87500000000 -12,2064,R1,windturbine,2050,4.87500000000 -12,2065,R1,windturbine,2050,4.87500000000 -12,2069,R1,windturbine,2050,4.87500000000 -12,2070,R1,windturbine,2050,4.87500000000 -12,2074,R1,windturbine,2050,4.87500000000 -12,2075,R1,windturbine,2050,4.87500000000 -12,2079,R1,windturbine,2050,4.87500000000 +0,2025,R1,gasCCGT,2020,1.80560000000 +0,2030,R1,gasCCGT,2020,0.80560000000 +0,2035,R1,gasCCGT,2020,0.80560000000 +0,2040,R1,gasCCGT,2020,0.80560000000 +0,2045,R1,gasCCGT,2020,0.80560000000 +0,2049,R1,gasCCGT,2020,0.80560000000 +0,2050,R1,gasCCGT,2020,0.80560000000 +0,2054,R1,gasCCGT,2020,0.80560000000 +0,2055,R1,gasCCGT,2020,0.80560000000 +0,2059,R1,gasCCGT,2020,0.80560000000 +1,2030,R1,gasCCGT,2025,3.75000000000 +1,2035,R1,gasCCGT,2025,3.75000000000 +1,2040,R1,gasCCGT,2025,3.75000000000 +1,2045,R1,gasCCGT,2025,3.75000000000 +1,2049,R1,gasCCGT,2025,3.75000000000 +1,2050,R1,gasCCGT,2025,3.75000000000 +1,2054,R1,gasCCGT,2025,3.75000000000 +1,2055,R1,gasCCGT,2025,3.75000000000 +1,2059,R1,gasCCGT,2025,3.75000000000 +1,2060,R1,gasCCGT,2025,3.75000000000 +1,2064,R1,gasCCGT,2025,3.75000000000 +2,2030,R1,solarPV,2025,8.43750000000 +2,2035,R1,solarPV,2025,8.43750000000 +2,2040,R1,solarPV,2025,8.43750000000 +2,2045,R1,solarPV,2025,8.43750000000 +2,2049,R1,solarPV,2025,8.43750000000 +2,2050,R1,solarPV,2025,8.43750000000 +2,2054,R1,solarPV,2025,8.43750000000 +3,2035,R1,solarPV,2030,1.36670000000 +3,2040,R1,solarPV,2030,1.36670000000 +3,2045,R1,solarPV,2030,1.36670000000 +3,2049,R1,solarPV,2030,1.36670000000 +3,2050,R1,solarPV,2030,1.36670000000 +3,2054,R1,solarPV,2030,1.36670000000 +3,2055,R1,solarPV,2030,1.36670000000 +3,2059,R1,solarPV,2030,1.36670000000 +4,2040,R1,solarPV,2035,4.57500000000 +4,2045,R1,solarPV,2035,4.57500000000 +4,2049,R1,solarPV,2035,4.57500000000 +4,2050,R1,solarPV,2035,4.57500000000 +4,2054,R1,solarPV,2035,4.57500000000 +4,2055,R1,solarPV,2035,4.57500000000 +4,2059,R1,solarPV,2035,4.57500000000 +4,2060,R1,solarPV,2035,4.57500000000 +4,2064,R1,solarPV,2035,4.57500000000 +5,2045,R1,solarPV,2040,12.20000000000 +5,2049,R1,solarPV,2040,12.20000000000 +5,2050,R1,solarPV,2040,12.20000000000 +5,2054,R1,solarPV,2040,12.20000000000 +5,2055,R1,solarPV,2040,12.20000000000 +5,2059,R1,solarPV,2040,12.20000000000 +5,2060,R1,solarPV,2040,12.20000000000 +5,2064,R1,solarPV,2040,12.20000000000 +5,2065,R1,solarPV,2040,12.20000000000 +5,2069,R1,solarPV,2040,12.20000000000 +6,2049,R1,solarPV,2045,2.40000000000 +6,2050,R1,solarPV,2045,11.25630000000 +6,2054,R1,solarPV,2045,11.25630000000 +6,2055,R1,solarPV,2045,11.25630000000 +6,2059,R1,solarPV,2045,11.25630000000 +6,2060,R1,solarPV,2045,11.25630000000 +6,2064,R1,solarPV,2045,11.25630000000 +6,2065,R1,solarPV,2045,11.25630000000 +6,2069,R1,solarPV,2045,11.25630000000 +6,2070,R1,solarPV,2045,11.25630000000 +6,2074,R1,solarPV,2045,11.25630000000 +7,2055,R1,solarPV,2050,10.00000000000 +7,2059,R1,solarPV,2050,10.00000000000 +7,2060,R1,solarPV,2050,10.00000000000 +7,2064,R1,solarPV,2050,10.00000000000 +7,2065,R1,solarPV,2050,10.00000000000 +7,2069,R1,solarPV,2050,10.00000000000 +7,2070,R1,solarPV,2050,10.00000000000 +7,2074,R1,solarPV,2050,10.00000000000 +7,2075,R1,solarPV,2050,10.00000000000 +7,2079,R1,solarPV,2050,10.00000000000 +8,2025,R1,windturbine,2020,1.81250000000 +8,2030,R1,windturbine,2020,1.81250000000 +8,2035,R1,windturbine,2020,1.81250000000 +8,2040,R1,windturbine,2020,1.81250000000 +8,2045,R1,windturbine,2020,1.81250000000 +8,2049,R1,windturbine,2020,1.81250000000 +9,2040,R1,windturbine,2035,0.65830000000 +9,2045,R1,windturbine,2035,0.65830000000 +9,2049,R1,windturbine,2035,0.65830000000 +9,2050,R1,windturbine,2035,0.65830000000 +9,2054,R1,windturbine,2035,0.65830000000 +9,2055,R1,windturbine,2035,0.65830000000 +9,2059,R1,windturbine,2035,0.65830000000 +9,2060,R1,windturbine,2035,0.65830000000 +9,2064,R1,windturbine,2035,0.65830000000 +10,2055,R1,windturbine,2050,7.87600000000 +10,2059,R1,windturbine,2050,7.87600000000 +10,2060,R1,windturbine,2050,7.87600000000 +10,2064,R1,windturbine,2050,7.87600000000 +10,2065,R1,windturbine,2050,7.87600000000 +10,2069,R1,windturbine,2050,7.87600000000 +10,2070,R1,windturbine,2050,7.87600000000 +10,2074,R1,windturbine,2050,7.87600000000 +10,2075,R1,windturbine,2050,7.87600000000 +10,2079,R1,windturbine,2050,7.87600000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv index bcdf148c6..c58d0c1f6 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv @@ -1,6 +1,8 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 +0,2025,R1,gasboiler,2020,14.50000000000 +0,2030,R1,gasboiler,2020,9.50000000000 +0,2034,R1,gasboiler,2020,9.50000000000 +1,2025,R1,heatpump,2020,9.50000000000 +1,2030,R1,heatpump,2020,9.50000000000 +1,2034,R1,heatpump,2020,9.50000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv index 9d7ceeff7..4e3d88714 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv @@ -1,9 +1,11 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 +0,2025,R1,gasboiler,2020,14.50000000000 +0,2030,R1,gasboiler,2020,9.50000000000 +0,2034,R1,gasboiler,2020,9.50000000000 +1,2025,R1,heatpump,2020,9.50000000000 +1,2030,R1,heatpump,2020,9.50000000000 +1,2034,R1,heatpump,2020,9.50000000000 2,2030,R1,heatpump,2025,11.00000000000 2,2034,R1,heatpump,2025,11.00000000000 2,2035,R1,heatpump,2025,11.00000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv index b636c62a8..c385d1415 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv @@ -1,14 +1,20 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 +0,2025,R1,gasboiler,2020,14.50000000000 +0,2030,R1,gasboiler,2020,9.50000000000 +0,2034,R1,gasboiler,2020,9.50000000000 +1,2035,R1,gasboiler,2030,11.40000000000 +1,2039,R1,gasboiler,2030,11.40000000000 +1,2040,R1,gasboiler,2030,11.40000000000 +1,2044,R1,gasboiler,2030,11.40000000000 +2,2025,R1,heatpump,2020,9.50000000000 +2,2030,R1,heatpump,2020,9.50000000000 +2,2034,R1,heatpump,2020,9.50000000000 +3,2030,R1,heatpump,2025,11.00000000000 +3,2034,R1,heatpump,2025,11.00000000000 +3,2035,R1,heatpump,2025,11.00000000000 +3,2039,R1,heatpump,2025,11.00000000000 +4,2035,R1,heatpump,2030,13.60000000000 +4,2039,R1,heatpump,2030,13.60000000000 +4,2040,R1,heatpump,2030,13.60000000000 +4,2044,R1,heatpump,2030,13.60000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv index e9ff1cebf..499e6e12b 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv @@ -1,18 +1,24 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 -4,2040,R1,heatpump,2035,17.00000000000 -4,2044,R1,heatpump,2035,17.00000000000 -4,2045,R1,heatpump,2035,17.00000000000 -4,2049,R1,heatpump,2035,17.00000000000 +0,2025,R1,gasboiler,2020,14.50000000000 +0,2030,R1,gasboiler,2020,9.50000000000 +0,2034,R1,gasboiler,2020,9.50000000000 +1,2035,R1,gasboiler,2030,11.40000000000 +1,2039,R1,gasboiler,2030,11.40000000000 +1,2040,R1,gasboiler,2030,11.40000000000 +1,2044,R1,gasboiler,2030,11.40000000000 +2,2025,R1,heatpump,2020,9.50000000000 +2,2030,R1,heatpump,2020,9.50000000000 +2,2034,R1,heatpump,2020,9.50000000000 +3,2030,R1,heatpump,2025,11.00000000000 +3,2034,R1,heatpump,2025,11.00000000000 +3,2035,R1,heatpump,2025,11.00000000000 +3,2039,R1,heatpump,2025,11.00000000000 +4,2035,R1,heatpump,2030,13.60000000000 +4,2039,R1,heatpump,2030,13.60000000000 +4,2040,R1,heatpump,2030,13.60000000000 +4,2044,R1,heatpump,2030,13.60000000000 +5,2040,R1,heatpump,2035,17.00000000000 +5,2044,R1,heatpump,2035,17.00000000000 +5,2045,R1,heatpump,2035,17.00000000000 +5,2049,R1,heatpump,2035,17.00000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv index 2d54c0aa9..94a395137 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv @@ -1,22 +1,28 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 -4,2040,R1,heatpump,2035,17.00000000000 -4,2044,R1,heatpump,2035,17.00000000000 -4,2045,R1,heatpump,2035,17.00000000000 -4,2049,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2040,31.00000000000 -5,2049,R1,heatpump,2040,31.00000000000 -5,2050,R1,heatpump,2040,31.00000000000 -5,2054,R1,heatpump,2040,31.00000000000 +0,2025,R1,gasboiler,2020,14.50000000000 +0,2030,R1,gasboiler,2020,9.50000000000 +0,2034,R1,gasboiler,2020,9.50000000000 +1,2035,R1,gasboiler,2030,11.40000000000 +1,2039,R1,gasboiler,2030,11.40000000000 +1,2040,R1,gasboiler,2030,11.40000000000 +1,2044,R1,gasboiler,2030,11.40000000000 +2,2025,R1,heatpump,2020,9.50000000000 +2,2030,R1,heatpump,2020,9.50000000000 +2,2034,R1,heatpump,2020,9.50000000000 +3,2030,R1,heatpump,2025,11.00000000000 +3,2034,R1,heatpump,2025,11.00000000000 +3,2035,R1,heatpump,2025,11.00000000000 +3,2039,R1,heatpump,2025,11.00000000000 +4,2035,R1,heatpump,2030,13.60000000000 +4,2039,R1,heatpump,2030,13.60000000000 +4,2040,R1,heatpump,2030,13.60000000000 +4,2044,R1,heatpump,2030,13.60000000000 +5,2040,R1,heatpump,2035,17.00000000000 +5,2044,R1,heatpump,2035,17.00000000000 +5,2045,R1,heatpump,2035,17.00000000000 +5,2049,R1,heatpump,2035,17.00000000000 +6,2045,R1,heatpump,2040,31.00000000000 +6,2049,R1,heatpump,2040,31.00000000000 +6,2050,R1,heatpump,2040,31.00000000000 +6,2054,R1,heatpump,2040,31.00000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv index 5924d03b5..5367158a8 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv @@ -1,26 +1,32 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 -4,2040,R1,heatpump,2035,17.00000000000 -4,2044,R1,heatpump,2035,17.00000000000 -4,2045,R1,heatpump,2035,17.00000000000 -4,2049,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2040,31.00000000000 -5,2049,R1,heatpump,2040,31.00000000000 -5,2050,R1,heatpump,2040,31.00000000000 -5,2054,R1,heatpump,2040,31.00000000000 -6,2050,R1,heatpump,2045,23.00000000000 -6,2054,R1,heatpump,2045,23.00000000000 -6,2055,R1,heatpump,2045,23.00000000000 -6,2059,R1,heatpump,2045,23.00000000000 +0,2025,R1,gasboiler,2020,14.50000000000 +0,2030,R1,gasboiler,2020,9.50000000000 +0,2034,R1,gasboiler,2020,9.50000000000 +1,2035,R1,gasboiler,2030,11.40000000000 +1,2039,R1,gasboiler,2030,11.40000000000 +1,2040,R1,gasboiler,2030,11.40000000000 +1,2044,R1,gasboiler,2030,11.40000000000 +2,2025,R1,heatpump,2020,9.50000000000 +2,2030,R1,heatpump,2020,9.50000000000 +2,2034,R1,heatpump,2020,9.50000000000 +3,2030,R1,heatpump,2025,11.00000000000 +3,2034,R1,heatpump,2025,11.00000000000 +3,2035,R1,heatpump,2025,11.00000000000 +3,2039,R1,heatpump,2025,11.00000000000 +4,2035,R1,heatpump,2030,13.60000000000 +4,2039,R1,heatpump,2030,13.60000000000 +4,2040,R1,heatpump,2030,13.60000000000 +4,2044,R1,heatpump,2030,13.60000000000 +5,2040,R1,heatpump,2035,17.00000000000 +5,2044,R1,heatpump,2035,17.00000000000 +5,2045,R1,heatpump,2035,17.00000000000 +5,2049,R1,heatpump,2035,17.00000000000 +6,2045,R1,heatpump,2040,31.00000000000 +6,2049,R1,heatpump,2040,31.00000000000 +6,2050,R1,heatpump,2040,31.00000000000 +6,2054,R1,heatpump,2040,31.00000000000 +7,2050,R1,heatpump,2045,23.00000000000 +7,2054,R1,heatpump,2045,23.00000000000 +7,2055,R1,heatpump,2045,23.00000000000 +7,2059,R1,heatpump,2045,23.00000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv index be30eaf2d..3d5b42b26 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv @@ -1,30 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,5.00000000000 -1,2025,R1,heatpump,2020,19.00000000000 -1,2030,R1,heatpump,2020,19.00000000000 -1,2034,R1,heatpump,2020,19.00000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2030,25.00000000000 -3,2039,R1,heatpump,2030,25.00000000000 -3,2040,R1,heatpump,2030,25.00000000000 -3,2044,R1,heatpump,2030,25.00000000000 -4,2040,R1,heatpump,2035,17.00000000000 -4,2044,R1,heatpump,2035,17.00000000000 -4,2045,R1,heatpump,2035,17.00000000000 -4,2049,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2040,31.00000000000 -5,2049,R1,heatpump,2040,31.00000000000 -5,2050,R1,heatpump,2040,31.00000000000 -5,2054,R1,heatpump,2040,31.00000000000 -6,2050,R1,heatpump,2045,23.00000000000 -6,2054,R1,heatpump,2045,23.00000000000 -6,2055,R1,heatpump,2045,23.00000000000 -6,2059,R1,heatpump,2045,23.00000000000 -7,2055,R1,heatpump,2050,31.00000000000 -7,2059,R1,heatpump,2050,31.00000000000 -7,2060,R1,heatpump,2050,31.00000000000 -7,2064,R1,heatpump,2050,31.00000000000 +0,2025,R1,gasboiler,2020,14.50000000000 +0,2030,R1,gasboiler,2020,9.50000000000 +0,2034,R1,gasboiler,2020,9.50000000000 +1,2035,R1,gasboiler,2030,11.40000000000 +1,2039,R1,gasboiler,2030,11.40000000000 +1,2040,R1,gasboiler,2030,11.40000000000 +1,2044,R1,gasboiler,2030,11.40000000000 +2,2025,R1,heatpump,2020,9.50000000000 +2,2030,R1,heatpump,2020,9.50000000000 +2,2034,R1,heatpump,2020,9.50000000000 +3,2030,R1,heatpump,2025,11.00000000000 +3,2034,R1,heatpump,2025,11.00000000000 +3,2035,R1,heatpump,2025,11.00000000000 +3,2039,R1,heatpump,2025,11.00000000000 +4,2035,R1,heatpump,2030,13.60000000000 +4,2039,R1,heatpump,2030,13.60000000000 +4,2040,R1,heatpump,2030,13.60000000000 +4,2044,R1,heatpump,2030,13.60000000000 +5,2040,R1,heatpump,2035,17.00000000000 +5,2044,R1,heatpump,2035,17.00000000000 +5,2045,R1,heatpump,2035,17.00000000000 +5,2049,R1,heatpump,2035,17.00000000000 +6,2045,R1,heatpump,2040,31.00000000000 +6,2049,R1,heatpump,2040,31.00000000000 +6,2050,R1,heatpump,2040,31.00000000000 +6,2054,R1,heatpump,2040,31.00000000000 +7,2050,R1,heatpump,2045,23.00000000000 +7,2054,R1,heatpump,2045,23.00000000000 +7,2055,R1,heatpump,2045,23.00000000000 +7,2059,R1,heatpump,2045,23.00000000000 +8,2055,R1,heatpump,2050,31.00000000000 +8,2059,R1,heatpump,2050,31.00000000000 +8,2060,R1,heatpump,2050,31.00000000000 +8,2064,R1,heatpump,2050,31.00000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv index 7b8c4061d..0a3c16bc3 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv @@ -1,31 +1,31 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000 -0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000 -0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000 +0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.80560000000 +0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.52780000000 0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000 -0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000 +0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,52.12750000000 1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000 -1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000 -1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000 +1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.20830000000 +1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.79170000000 1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000 -1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000 +1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,78.19120000000 2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000 -2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000 -2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000 +2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.80560000000 +2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.52780000000 2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000 -2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000 +2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,52.12750000000 3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000 -3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000 -3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000 +3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.20830000000 +3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.79170000000 3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000 -3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000 +3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,78.19120000000 4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000 -4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000 -4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000 +4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.41670000000 +4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.58330000000 4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000 -4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000 +4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,156.38250000000 5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000 -5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000 -5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000 +5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.61110000000 +5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.05560000000 5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000 -5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000 +5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,104.25500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv index b07adde6b..6c362d1a3 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv @@ -1,31 +1,43 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000 -0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000 -0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000 +0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.80560000000 +0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.52780000000 +0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.52780000000 +0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.52780000000 0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000 -1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000 -1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000 -1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000 +0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,52.12750000000 +0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,34.15250000000 +1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.20830000000 +1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.79170000000 +1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.79170000000 +1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.79170000000 1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000 -2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000 -2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000 -2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000 +1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,78.19120000000 +1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,51.22880000000 +2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.80560000000 +2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.52780000000 +2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.52780000000 +2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.52780000000 2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000 -3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000 -3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000 -3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000 +2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,52.12750000000 +2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,34.15250000000 +3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.20830000000 +3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.79170000000 +3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.79170000000 +3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.79170000000 3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000 -4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000 -4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000 -4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000 +3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,78.19120000000 +3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,51.22880000000 +4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.41670000000 +4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.58330000000 +4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.58330000000 +4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.58330000000 4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000 -5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000 -5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000 -5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000 +4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,156.38250000000 +4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,102.45750000000 +5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.61110000000 +5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.05560000000 +5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,1.05560000000 +5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.05560000000 5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000 +5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,104.25500000000 +5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,68.30500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv index 33951ce29..b6e35b7ca 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv @@ -1,25 +1,49 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000 -0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000 -1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000 -1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000 -2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000 -2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000 -3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000 -3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000 -4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000 -4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000 -5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000 -5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000 +0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.52780000000 +0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,0.52780000000 +0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.61110000000 +0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2030,0.63330000000 +0,heat,2035,3,R1,all-year,all-week,night,heatpump,2025,0.61110000000 +0,heat,2035,4,R1,all-year,all-week,night,heatpump,2030,0.75560000000 +0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,34.15250000000 +0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2030,40.98300000000 +1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.79170000000 +1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,0.79170000000 +1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 +1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2030,0.95000000000 +1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 +1,heat,2035,4,R1,all-year,all-week,morning,heatpump,2030,1.13330000000 +1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,51.22880000000 +1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2030,61.47450000000 +2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.52780000000 +2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,0.52780000000 +2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 +2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2030,0.63330000000 +2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 +2,heat,2035,4,R1,all-year,all-week,afternoon,heatpump,2030,0.75560000000 +2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,34.15250000000 +2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2030,40.98300000000 +3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.79170000000 +3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,0.79170000000 +3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 +3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2030,0.95000000000 +3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 +3,heat,2035,4,R1,all-year,all-week,early-peak,heatpump,2030,1.13330000000 +3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,51.22880000000 +3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2030,61.47450000000 +4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.58330000000 +4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,1.58330000000 +4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 +4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2030,1.90000000000 +4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 +4,heat,2035,4,R1,all-year,all-week,late-peak,heatpump,2030,2.26670000000 +4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,102.45750000000 +4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2030,122.94900000000 +5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,1.05560000000 +5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,1.05560000000 +5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 +5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2030,1.26670000000 +5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 +5,heat,2035,4,R1,all-year,all-week,evening,heatpump,2030,1.51110000000 +5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,68.30500000000 +5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2030,81.96600000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv index c606a299c..1587b7cce 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv @@ -1,25 +1,49 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000 -0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000 -0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000 -1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000 -1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000 -2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000 -2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000 -3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000 -3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000 -4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000 -4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000 -5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000 -5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 +0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2030,0.63330000000 +0,heat,2035,3,R1,all-year,all-week,night,heatpump,2025,0.61110000000 +0,heat,2035,4,R1,all-year,all-week,night,heatpump,2030,0.75560000000 +0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2030,0.63330000000 +0,heat,2040,4,R1,all-year,all-week,night,heatpump,2030,0.75560000000 +0,heat,2040,5,R1,all-year,all-week,night,heatpump,2035,0.94440000000 +0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2030,40.98300000000 +0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2030,40.98300000000 +1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2030,0.95000000000 +1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 +1,heat,2035,4,R1,all-year,all-week,morning,heatpump,2030,1.13330000000 +1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2030,0.95000000000 +1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2030,1.13330000000 +1,heat,2040,5,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 +1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2030,61.47450000000 +1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2030,61.47450000000 +2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2030,0.63330000000 +2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 +2,heat,2035,4,R1,all-year,all-week,afternoon,heatpump,2030,0.75560000000 +2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2030,0.63330000000 +2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2030,0.75560000000 +2,heat,2040,5,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 +2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2030,40.98300000000 +2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2030,40.98300000000 +3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2030,0.95000000000 +3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 +3,heat,2035,4,R1,all-year,all-week,early-peak,heatpump,2030,1.13330000000 +3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2030,0.95000000000 +3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2030,1.13330000000 +3,heat,2040,5,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 +3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2030,61.47450000000 +3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2030,61.47450000000 +4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2030,1.90000000000 +4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 +4,heat,2035,4,R1,all-year,all-week,late-peak,heatpump,2030,2.26670000000 +4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2030,1.90000000000 +4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2030,2.26670000000 +4,heat,2040,5,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 +4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2030,122.94900000000 +4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2030,122.94900000000 +5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2030,1.26670000000 +5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 +5,heat,2035,4,R1,all-year,all-week,evening,heatpump,2030,1.51110000000 +5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2030,1.26670000000 +5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2030,1.51110000000 +5,heat,2040,5,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 +5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2030,81.96600000000 +5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2030,81.96600000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv index d66038bc0..c3f4f2153 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv @@ -1,25 +1,37 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000 -0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000 -1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000 -2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000 -3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000 -4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000 -5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 +0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2030,0.63330000000 +0,heat,2040,4,R1,all-year,all-week,night,heatpump,2030,0.75560000000 +0,heat,2040,5,R1,all-year,all-week,night,heatpump,2035,0.94440000000 +0,heat,2045,5,R1,all-year,all-week,night,heatpump,2035,0.94440000000 +0,heat,2045,6,R1,all-year,all-week,night,heatpump,2040,1.72220000000 +0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2030,40.98300000000 +1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2030,0.95000000000 +1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2030,1.13330000000 +1,heat,2040,5,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 +1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 +1,heat,2045,6,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 +1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2030,61.47450000000 +2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2030,0.63330000000 +2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2030,0.75560000000 +2,heat,2040,5,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 +2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 +2,heat,2045,6,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 +2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2030,40.98300000000 +3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2030,0.95000000000 +3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2030,1.13330000000 +3,heat,2040,5,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 +3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 +3,heat,2045,6,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 +3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2030,61.47450000000 +4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2030,1.90000000000 +4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2030,2.26670000000 +4,heat,2040,5,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 +4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 +4,heat,2045,6,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 +4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2030,122.94900000000 +5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2030,1.26670000000 +5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2030,1.51110000000 +5,heat,2040,5,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 +5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 +5,heat,2045,6,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 +5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2030,81.96600000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv index 2f0389d3c..535edc7ae 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv @@ -1,25 +1,25 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000 -1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 -2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 -3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 -4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 -5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 +0,heat,2045,5,R1,all-year,all-week,night,heatpump,2035,0.94440000000 +0,heat,2045,6,R1,all-year,all-week,night,heatpump,2040,1.72220000000 +0,heat,2050,6,R1,all-year,all-week,night,heatpump,2040,1.72220000000 +0,heat,2050,7,R1,all-year,all-week,night,heatpump,2045,1.27780000000 +1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 +1,heat,2045,6,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 +1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 +1,heat,2050,7,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 +2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 +2,heat,2045,6,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 +2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 +2,heat,2050,7,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 +3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 +3,heat,2045,6,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 +3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 +3,heat,2050,7,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 +4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 +4,heat,2045,6,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 +4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 +4,heat,2050,7,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 +5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 +5,heat,2045,6,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 +5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 +5,heat,2050,7,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv index 3b6658d81..136de0837 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv @@ -1,25 +1,25 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000 -0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000 -0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000 -1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 -1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 -1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000 -2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 -2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 -2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000 -3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 -3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 -3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000 -4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 -4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 -4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000 -5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 -5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 -5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000 +0,heat,2050,6,R1,all-year,all-week,night,heatpump,2040,1.72220000000 +0,heat,2050,7,R1,all-year,all-week,night,heatpump,2045,1.27780000000 +0,heat,2055,7,R1,all-year,all-week,night,heatpump,2045,1.27780000000 +0,heat,2055,8,R1,all-year,all-week,night,heatpump,2050,1.72220000000 +1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 +1,heat,2050,7,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 +1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 +1,heat,2055,8,R1,all-year,all-week,morning,heatpump,2050,2.58330000000 +2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 +2,heat,2050,7,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 +2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 +2,heat,2055,8,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000 +3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 +3,heat,2050,7,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 +3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 +3,heat,2055,8,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000 +4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 +4,heat,2050,7,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 +4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 +4,heat,2055,8,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000 +5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 +5,heat,2050,7,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 +5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 +5,heat,2055,8,R1,all-year,all-week,evening,heatpump,2050,3.44440000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv index d5a5d0dba..e1d16f18a 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv @@ -1,3 +1,3 @@ AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type Agent1,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,0.5,-1,inf,New -Agent2,A2,R1,LCOE,EAC,,0.5,0.5,,True,True,,all,weighted_sum,0.5,-1,inf,New +Agent2,A2,R1,fuel_consumption_cost,LCOE,,0.5,0.5,,True,True,,all,weighted_sum,0.5,-1,inf,New diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py index e89da4db2..9beedbee2 100644 --- a/docs/tutorial-code/2-add-agent/generate_models.py +++ b/docs/tutorial-code/2-add-agent/generate_models.py @@ -31,6 +31,12 @@ def generate_model_1(): agentshare_new="Agent2", ) + # Change objective for agent A2 + agents_file = model_path / "technodata/Agents.csv" + df = pd.read_csv(agents_file) + df.loc[df["Name"] == "A2", "Objective1"] = "fuel_consumption_cost" + df.to_csv(agents_file, index=False) + # Split population between the two agents agents_file = model_path / "technodata/Agents.csv" df = pd.read_csv(agents_file) @@ -65,7 +71,7 @@ def generate_model_2(): # Add second objective for agent A2 agents_file = model_path / "technodata/Agents.csv" df = pd.read_csv(agents_file) - df.loc[df["Name"] == "A2", "Objective2"] = "EAC" + df.loc[df["Name"] == "A2", "Objective2"] = "LCOE" df.loc[df["Name"] == "A2", "DecisionMethod"] = "weighted_sum" df.loc[df["Name"] == "A2", ["ObjData1", "ObjData2"]] = 0.5 df.loc[df["Name"] == "A2", "Objsort2"] = True From 9f89c84904191856d08e6cbe552df215291da0f9 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 9 Aug 2024 17:02:47 +0100 Subject: [PATCH 4/6] Simplify model --- .../Results/Gas/Capacity/2020.csv | 14 +- .../Results/Gas/Capacity/2025.csv | 30 +-- .../Results/Gas/Capacity/2030.csv | 48 ++-- .../Results/Gas/Capacity/2035.csv | 68 +++--- .../Results/Gas/Capacity/2040.csv | 68 +++--- .../Results/Gas/Capacity/2045.csv | 68 +++--- .../Results/Gas/Capacity/2050.csv | 68 +++--- .../Results/MCACapacity.csv | 192 ++++++++------- .../Results/MCAPrices.csv | 144 +++++------ .../Results/Power/Capacity/2020.csv | 28 +-- .../Results/Power/Capacity/2025.csv | 68 +++--- .../Results/Power/Capacity/2030.csv | 84 +++---- .../Results/Power/Capacity/2035.csv | 120 +++++----- .../Results/Power/Capacity/2040.csv | 150 ++++++------ .../Results/Power/Capacity/2045.csv | 172 ++++++------- .../Results/Power/Capacity/2050.csv | 225 ++++++++++-------- .../Results/Residential/Capacity/2020.csv | 12 +- .../Results/Residential/Capacity/2025.csv | 24 +- .../Results/Residential/Capacity/2030.csv | 40 ++-- .../Results/Residential/Capacity/2035.csv | 52 ++-- .../Results/Residential/Capacity/2040.csv | 64 +++-- .../Results/Residential/Capacity/2045.csv | 72 +++--- .../Results/Residential/Capacity/2050.csv | 80 ++++--- .../Results/Residential/Supply/2020.csv | 36 +-- .../Results/Residential/Supply/2025.csv | 96 ++++---- .../Results/Residential/Supply/2030.csv | 120 ++++++---- .../Results/Residential/Supply/2035.csv | 120 ++++++---- .../Results/Residential/Supply/2040.csv | 108 ++++++--- .../Results/Residential/Supply/2045.csv | 84 +++++-- .../Results/Residential/Supply/2050.csv | 60 +++-- .../technodata/residential/Technodata.csv | 4 +- .../2-add-agent/generate_models.py | 6 - 32 files changed, 1383 insertions(+), 1142 deletions(-) diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv index c7a43f048..2f57be103 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv @@ -1,9 +1,9 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,19.46470000000 -0,2030,R1,gassupply1,2020,11.96470000000 -0,2035,R1,gassupply1,2020,4.46470000000 -0,2040,R1,gassupply1,2020,4.46470000000 -0,2045,R1,gassupply1,2020,4.46470000000 -0,2050,R1,gassupply1,2020,4.46470000000 -0,2059,R1,gassupply1,2020,4.46470000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv index 59d409373..01dd6cb86 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv @@ -1,17 +1,17 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,19.46470000000 -0,2030,R1,gassupply1,2020,11.96470000000 -0,2035,R1,gassupply1,2020,4.46470000000 -0,2040,R1,gassupply1,2020,4.46470000000 -0,2045,R1,gassupply1,2020,4.46470000000 -0,2050,R1,gassupply1,2020,4.46470000000 -0,2059,R1,gassupply1,2020,4.46470000000 -1,2030,R1,gassupply1,2025,7.88760000000 -1,2035,R1,gassupply1,2025,7.88760000000 -1,2040,R1,gassupply1,2025,7.88760000000 -1,2045,R1,gassupply1,2025,7.88760000000 -1,2050,R1,gassupply1,2025,7.88760000000 -1,2059,R1,gassupply1,2025,7.88760000000 -1,2060,R1,gassupply1,2025,7.88760000000 -1,2064,R1,gassupply1,2025,7.88760000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,10.34110000000 +1,2035,R1,gassupply1,2025,10.34110000000 +1,2040,R1,gassupply1,2025,10.34110000000 +1,2045,R1,gassupply1,2025,10.34110000000 +1,2050,R1,gassupply1,2025,10.34110000000 +1,2059,R1,gassupply1,2025,10.34110000000 +1,2060,R1,gassupply1,2025,10.34110000000 +1,2064,R1,gassupply1,2025,10.34110000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv index d65885a4e..60c318837 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv @@ -1,26 +1,26 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,19.46470000000 -0,2030,R1,gassupply1,2020,11.96470000000 -0,2035,R1,gassupply1,2020,4.46470000000 -0,2040,R1,gassupply1,2020,4.46470000000 -0,2045,R1,gassupply1,2020,4.46470000000 -0,2050,R1,gassupply1,2020,4.46470000000 -0,2059,R1,gassupply1,2020,4.46470000000 -1,2030,R1,gassupply1,2025,7.88760000000 -1,2035,R1,gassupply1,2025,7.88760000000 -1,2040,R1,gassupply1,2025,7.88760000000 -1,2045,R1,gassupply1,2025,7.88760000000 -1,2050,R1,gassupply1,2025,7.88760000000 -1,2059,R1,gassupply1,2025,7.88760000000 -1,2060,R1,gassupply1,2025,7.88760000000 -1,2064,R1,gassupply1,2025,7.88760000000 -2,2035,R1,gassupply1,2030,10.89990000000 -2,2040,R1,gassupply1,2030,10.89990000000 -2,2045,R1,gassupply1,2030,10.89990000000 -2,2050,R1,gassupply1,2030,10.89990000000 -2,2059,R1,gassupply1,2030,10.89990000000 -2,2060,R1,gassupply1,2030,10.89990000000 -2,2064,R1,gassupply1,2030,10.89990000000 -2,2065,R1,gassupply1,2030,10.89990000000 -2,2069,R1,gassupply1,2030,10.89990000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,10.34110000000 +1,2035,R1,gassupply1,2025,10.34110000000 +1,2040,R1,gassupply1,2025,10.34110000000 +1,2045,R1,gassupply1,2025,10.34110000000 +1,2050,R1,gassupply1,2025,10.34110000000 +1,2059,R1,gassupply1,2025,10.34110000000 +1,2060,R1,gassupply1,2025,10.34110000000 +1,2064,R1,gassupply1,2025,10.34110000000 +2,2035,R1,gassupply1,2030,14.18760000000 +2,2040,R1,gassupply1,2030,14.18760000000 +2,2045,R1,gassupply1,2030,14.18760000000 +2,2050,R1,gassupply1,2030,14.18760000000 +2,2059,R1,gassupply1,2030,14.18760000000 +2,2060,R1,gassupply1,2030,14.18760000000 +2,2064,R1,gassupply1,2030,14.18760000000 +2,2065,R1,gassupply1,2030,14.18760000000 +2,2069,R1,gassupply1,2030,14.18760000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv index 323910b3b..7e4cdc157 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv @@ -1,36 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,19.46470000000 -0,2030,R1,gassupply1,2020,11.96470000000 -0,2035,R1,gassupply1,2020,4.46470000000 -0,2040,R1,gassupply1,2020,4.46470000000 -0,2045,R1,gassupply1,2020,4.46470000000 -0,2050,R1,gassupply1,2020,4.46470000000 -0,2059,R1,gassupply1,2020,4.46470000000 -1,2030,R1,gassupply1,2025,7.88760000000 -1,2035,R1,gassupply1,2025,7.88760000000 -1,2040,R1,gassupply1,2025,7.88760000000 -1,2045,R1,gassupply1,2025,7.88760000000 -1,2050,R1,gassupply1,2025,7.88760000000 -1,2059,R1,gassupply1,2025,7.88760000000 -1,2060,R1,gassupply1,2025,7.88760000000 -1,2064,R1,gassupply1,2025,7.88760000000 -2,2035,R1,gassupply1,2030,10.89990000000 -2,2040,R1,gassupply1,2030,10.89990000000 -2,2045,R1,gassupply1,2030,10.89990000000 -2,2050,R1,gassupply1,2030,10.89990000000 -2,2059,R1,gassupply1,2030,10.89990000000 -2,2060,R1,gassupply1,2030,10.89990000000 -2,2064,R1,gassupply1,2030,10.89990000000 -2,2065,R1,gassupply1,2030,10.89990000000 -2,2069,R1,gassupply1,2030,10.89990000000 -3,2040,R1,gassupply1,2035,0.01580000000 -3,2045,R1,gassupply1,2035,0.01580000000 -3,2050,R1,gassupply1,2035,0.01580000000 -3,2059,R1,gassupply1,2035,0.01580000000 -3,2060,R1,gassupply1,2035,0.01580000000 -3,2064,R1,gassupply1,2035,0.01580000000 -3,2065,R1,gassupply1,2035,0.01580000000 -3,2069,R1,gassupply1,2035,0.01580000000 -3,2070,R1,gassupply1,2035,0.01580000000 -3,2074,R1,gassupply1,2035,0.01580000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,10.34110000000 +1,2035,R1,gassupply1,2025,10.34110000000 +1,2040,R1,gassupply1,2025,10.34110000000 +1,2045,R1,gassupply1,2025,10.34110000000 +1,2050,R1,gassupply1,2025,10.34110000000 +1,2059,R1,gassupply1,2025,10.34110000000 +1,2060,R1,gassupply1,2025,10.34110000000 +1,2064,R1,gassupply1,2025,10.34110000000 +2,2035,R1,gassupply1,2030,14.18760000000 +2,2040,R1,gassupply1,2030,14.18760000000 +2,2045,R1,gassupply1,2030,14.18760000000 +2,2050,R1,gassupply1,2030,14.18760000000 +2,2059,R1,gassupply1,2030,14.18760000000 +2,2060,R1,gassupply1,2030,14.18760000000 +2,2064,R1,gassupply1,2030,14.18760000000 +2,2065,R1,gassupply1,2030,14.18760000000 +2,2069,R1,gassupply1,2030,14.18760000000 +3,2040,R1,gassupply1,2035,0.98850000000 +3,2045,R1,gassupply1,2035,0.98850000000 +3,2050,R1,gassupply1,2035,0.98850000000 +3,2059,R1,gassupply1,2035,0.98850000000 +3,2060,R1,gassupply1,2035,0.98850000000 +3,2064,R1,gassupply1,2035,0.98850000000 +3,2065,R1,gassupply1,2035,0.98850000000 +3,2069,R1,gassupply1,2035,0.98850000000 +3,2070,R1,gassupply1,2035,0.98850000000 +3,2074,R1,gassupply1,2035,0.98850000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv index 323910b3b..7e4cdc157 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv @@ -1,36 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,19.46470000000 -0,2030,R1,gassupply1,2020,11.96470000000 -0,2035,R1,gassupply1,2020,4.46470000000 -0,2040,R1,gassupply1,2020,4.46470000000 -0,2045,R1,gassupply1,2020,4.46470000000 -0,2050,R1,gassupply1,2020,4.46470000000 -0,2059,R1,gassupply1,2020,4.46470000000 -1,2030,R1,gassupply1,2025,7.88760000000 -1,2035,R1,gassupply1,2025,7.88760000000 -1,2040,R1,gassupply1,2025,7.88760000000 -1,2045,R1,gassupply1,2025,7.88760000000 -1,2050,R1,gassupply1,2025,7.88760000000 -1,2059,R1,gassupply1,2025,7.88760000000 -1,2060,R1,gassupply1,2025,7.88760000000 -1,2064,R1,gassupply1,2025,7.88760000000 -2,2035,R1,gassupply1,2030,10.89990000000 -2,2040,R1,gassupply1,2030,10.89990000000 -2,2045,R1,gassupply1,2030,10.89990000000 -2,2050,R1,gassupply1,2030,10.89990000000 -2,2059,R1,gassupply1,2030,10.89990000000 -2,2060,R1,gassupply1,2030,10.89990000000 -2,2064,R1,gassupply1,2030,10.89990000000 -2,2065,R1,gassupply1,2030,10.89990000000 -2,2069,R1,gassupply1,2030,10.89990000000 -3,2040,R1,gassupply1,2035,0.01580000000 -3,2045,R1,gassupply1,2035,0.01580000000 -3,2050,R1,gassupply1,2035,0.01580000000 -3,2059,R1,gassupply1,2035,0.01580000000 -3,2060,R1,gassupply1,2035,0.01580000000 -3,2064,R1,gassupply1,2035,0.01580000000 -3,2065,R1,gassupply1,2035,0.01580000000 -3,2069,R1,gassupply1,2035,0.01580000000 -3,2070,R1,gassupply1,2035,0.01580000000 -3,2074,R1,gassupply1,2035,0.01580000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,10.34110000000 +1,2035,R1,gassupply1,2025,10.34110000000 +1,2040,R1,gassupply1,2025,10.34110000000 +1,2045,R1,gassupply1,2025,10.34110000000 +1,2050,R1,gassupply1,2025,10.34110000000 +1,2059,R1,gassupply1,2025,10.34110000000 +1,2060,R1,gassupply1,2025,10.34110000000 +1,2064,R1,gassupply1,2025,10.34110000000 +2,2035,R1,gassupply1,2030,14.18760000000 +2,2040,R1,gassupply1,2030,14.18760000000 +2,2045,R1,gassupply1,2030,14.18760000000 +2,2050,R1,gassupply1,2030,14.18760000000 +2,2059,R1,gassupply1,2030,14.18760000000 +2,2060,R1,gassupply1,2030,14.18760000000 +2,2064,R1,gassupply1,2030,14.18760000000 +2,2065,R1,gassupply1,2030,14.18760000000 +2,2069,R1,gassupply1,2030,14.18760000000 +3,2040,R1,gassupply1,2035,0.98850000000 +3,2045,R1,gassupply1,2035,0.98850000000 +3,2050,R1,gassupply1,2035,0.98850000000 +3,2059,R1,gassupply1,2035,0.98850000000 +3,2060,R1,gassupply1,2035,0.98850000000 +3,2064,R1,gassupply1,2035,0.98850000000 +3,2065,R1,gassupply1,2035,0.98850000000 +3,2069,R1,gassupply1,2035,0.98850000000 +3,2070,R1,gassupply1,2035,0.98850000000 +3,2074,R1,gassupply1,2035,0.98850000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv index 323910b3b..7e4cdc157 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv @@ -1,36 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,19.46470000000 -0,2030,R1,gassupply1,2020,11.96470000000 -0,2035,R1,gassupply1,2020,4.46470000000 -0,2040,R1,gassupply1,2020,4.46470000000 -0,2045,R1,gassupply1,2020,4.46470000000 -0,2050,R1,gassupply1,2020,4.46470000000 -0,2059,R1,gassupply1,2020,4.46470000000 -1,2030,R1,gassupply1,2025,7.88760000000 -1,2035,R1,gassupply1,2025,7.88760000000 -1,2040,R1,gassupply1,2025,7.88760000000 -1,2045,R1,gassupply1,2025,7.88760000000 -1,2050,R1,gassupply1,2025,7.88760000000 -1,2059,R1,gassupply1,2025,7.88760000000 -1,2060,R1,gassupply1,2025,7.88760000000 -1,2064,R1,gassupply1,2025,7.88760000000 -2,2035,R1,gassupply1,2030,10.89990000000 -2,2040,R1,gassupply1,2030,10.89990000000 -2,2045,R1,gassupply1,2030,10.89990000000 -2,2050,R1,gassupply1,2030,10.89990000000 -2,2059,R1,gassupply1,2030,10.89990000000 -2,2060,R1,gassupply1,2030,10.89990000000 -2,2064,R1,gassupply1,2030,10.89990000000 -2,2065,R1,gassupply1,2030,10.89990000000 -2,2069,R1,gassupply1,2030,10.89990000000 -3,2040,R1,gassupply1,2035,0.01580000000 -3,2045,R1,gassupply1,2035,0.01580000000 -3,2050,R1,gassupply1,2035,0.01580000000 -3,2059,R1,gassupply1,2035,0.01580000000 -3,2060,R1,gassupply1,2035,0.01580000000 -3,2064,R1,gassupply1,2035,0.01580000000 -3,2065,R1,gassupply1,2035,0.01580000000 -3,2069,R1,gassupply1,2035,0.01580000000 -3,2070,R1,gassupply1,2035,0.01580000000 -3,2074,R1,gassupply1,2035,0.01580000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,10.34110000000 +1,2035,R1,gassupply1,2025,10.34110000000 +1,2040,R1,gassupply1,2025,10.34110000000 +1,2045,R1,gassupply1,2025,10.34110000000 +1,2050,R1,gassupply1,2025,10.34110000000 +1,2059,R1,gassupply1,2025,10.34110000000 +1,2060,R1,gassupply1,2025,10.34110000000 +1,2064,R1,gassupply1,2025,10.34110000000 +2,2035,R1,gassupply1,2030,14.18760000000 +2,2040,R1,gassupply1,2030,14.18760000000 +2,2045,R1,gassupply1,2030,14.18760000000 +2,2050,R1,gassupply1,2030,14.18760000000 +2,2059,R1,gassupply1,2030,14.18760000000 +2,2060,R1,gassupply1,2030,14.18760000000 +2,2064,R1,gassupply1,2030,14.18760000000 +2,2065,R1,gassupply1,2030,14.18760000000 +2,2069,R1,gassupply1,2030,14.18760000000 +3,2040,R1,gassupply1,2035,0.98850000000 +3,2045,R1,gassupply1,2035,0.98850000000 +3,2050,R1,gassupply1,2035,0.98850000000 +3,2059,R1,gassupply1,2035,0.98850000000 +3,2060,R1,gassupply1,2035,0.98850000000 +3,2064,R1,gassupply1,2035,0.98850000000 +3,2065,R1,gassupply1,2035,0.98850000000 +3,2069,R1,gassupply1,2035,0.98850000000 +3,2070,R1,gassupply1,2035,0.98850000000 +3,2074,R1,gassupply1,2035,0.98850000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv index 323910b3b..7e4cdc157 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv @@ -1,36 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,19.46470000000 -0,2030,R1,gassupply1,2020,11.96470000000 -0,2035,R1,gassupply1,2020,4.46470000000 -0,2040,R1,gassupply1,2020,4.46470000000 -0,2045,R1,gassupply1,2020,4.46470000000 -0,2050,R1,gassupply1,2020,4.46470000000 -0,2059,R1,gassupply1,2020,4.46470000000 -1,2030,R1,gassupply1,2025,7.88760000000 -1,2035,R1,gassupply1,2025,7.88760000000 -1,2040,R1,gassupply1,2025,7.88760000000 -1,2045,R1,gassupply1,2025,7.88760000000 -1,2050,R1,gassupply1,2025,7.88760000000 -1,2059,R1,gassupply1,2025,7.88760000000 -1,2060,R1,gassupply1,2025,7.88760000000 -1,2064,R1,gassupply1,2025,7.88760000000 -2,2035,R1,gassupply1,2030,10.89990000000 -2,2040,R1,gassupply1,2030,10.89990000000 -2,2045,R1,gassupply1,2030,10.89990000000 -2,2050,R1,gassupply1,2030,10.89990000000 -2,2059,R1,gassupply1,2030,10.89990000000 -2,2060,R1,gassupply1,2030,10.89990000000 -2,2064,R1,gassupply1,2030,10.89990000000 -2,2065,R1,gassupply1,2030,10.89990000000 -2,2069,R1,gassupply1,2030,10.89990000000 -3,2040,R1,gassupply1,2035,0.01580000000 -3,2045,R1,gassupply1,2035,0.01580000000 -3,2050,R1,gassupply1,2035,0.01580000000 -3,2059,R1,gassupply1,2035,0.01580000000 -3,2060,R1,gassupply1,2035,0.01580000000 -3,2064,R1,gassupply1,2035,0.01580000000 -3,2065,R1,gassupply1,2035,0.01580000000 -3,2069,R1,gassupply1,2035,0.01580000000 -3,2070,R1,gassupply1,2035,0.01580000000 -3,2074,R1,gassupply1,2035,0.01580000000 +0,2025,R1,gassupply1,2020,18.38780000000 +0,2030,R1,gassupply1,2020,10.88780000000 +0,2035,R1,gassupply1,2020,3.38780000000 +0,2040,R1,gassupply1,2020,3.38780000000 +0,2045,R1,gassupply1,2020,3.38780000000 +0,2050,R1,gassupply1,2020,3.38780000000 +0,2059,R1,gassupply1,2020,3.38780000000 +1,2030,R1,gassupply1,2025,10.34110000000 +1,2035,R1,gassupply1,2025,10.34110000000 +1,2040,R1,gassupply1,2025,10.34110000000 +1,2045,R1,gassupply1,2025,10.34110000000 +1,2050,R1,gassupply1,2025,10.34110000000 +1,2059,R1,gassupply1,2025,10.34110000000 +1,2060,R1,gassupply1,2025,10.34110000000 +1,2064,R1,gassupply1,2025,10.34110000000 +2,2035,R1,gassupply1,2030,14.18760000000 +2,2040,R1,gassupply1,2030,14.18760000000 +2,2045,R1,gassupply1,2030,14.18760000000 +2,2050,R1,gassupply1,2030,14.18760000000 +2,2059,R1,gassupply1,2030,14.18760000000 +2,2060,R1,gassupply1,2030,14.18760000000 +2,2064,R1,gassupply1,2030,14.18760000000 +2,2065,R1,gassupply1,2030,14.18760000000 +2,2069,R1,gassupply1,2030,14.18760000000 +3,2040,R1,gassupply1,2035,0.98850000000 +3,2045,R1,gassupply1,2035,0.98850000000 +3,2050,R1,gassupply1,2035,0.98850000000 +3,2059,R1,gassupply1,2035,0.98850000000 +3,2060,R1,gassupply1,2035,0.98850000000 +3,2064,R1,gassupply1,2035,0.98850000000 +3,2065,R1,gassupply1,2035,0.98850000000 +3,2069,R1,gassupply1,2035,0.98850000000 +3,2070,R1,gassupply1,2035,0.98850000000 +3,2074,R1,gassupply1,2035,0.98850000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv index 83eb617e2..e4eea1aaf 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -7,107 +7,115 @@ A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A2,2.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,1.52780000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,9.73230000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,9.19390000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,9.19390000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 -A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2030 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,7.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A2,3.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A2,2.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A2,2.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2030 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A2,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 -A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A2,1.10000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,0.34170000000,R1,2030,R1,power,solarPV,newcapa,2035 -A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2035 -A2,1.02500000000,R1,2030,R1,power,solarPV,newcapa,2035 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,3.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 +A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A2,2.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,0.08330000000,R1,2030,R1,power,solarPV,newcapa,2035 +A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2035 +A2,0.25000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A2,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A2,1.10000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,0.34170000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,1.70830000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,0.65830000000,R1,2035,R1,power,windturbine,newcapa,2040 -A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2040 -A2,1.02500000000,R1,2030,R1,power,solarPV,newcapa,2040 -A2,2.86670000000,R1,2035,R1,power,solarPV,newcapa,2040 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 +A2,4.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 +A2,4.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,0.08330000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,0.41670000000,R1,2035,R1,power,solarPV,newcapa,2040 +A1,0.75000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2040 +A2,0.25000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A2,1.58330000000,R1,2035,R1,power,solarPV,newcapa,2040 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 -A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,0.34170000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,1.70830000000,R1,2035,R1,power,solarPV,newcapa,2045 -A1,6.10000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,0.65830000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2045 -A2,1.02500000000,R1,2030,R1,power,solarPV,newcapa,2045 -A2,2.86670000000,R1,2035,R1,power,solarPV,newcapa,2045 -A2,6.10000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,4.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 +A2,11.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 +A2,4.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 +A2,4.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.08330000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,0.41670000000,R1,2035,R1,power,solarPV,newcapa,2045 +A1,2.50000000000,R1,2040,R1,power,solarPV,newcapa,2045 +A1,0.75000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,0.70830000000,R1,2040,R1,power,windturbine,newcapa,2045 +A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2045 +A2,0.25000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A2,1.58330000000,R1,2035,R1,power,solarPV,newcapa,2045 +A2,3.20830000000,R1,2040,R1,power,solarPV,newcapa,2045 +A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 +A2,11.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050 +A2,4.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.34170000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,1.70830000000,R1,2035,R1,power,solarPV,newcapa,2050 -A1,6.10000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,0.65830000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,8.43750000000,R1,2025,R1,power,solarPV,newcapa,2050 -A2,1.02500000000,R1,2030,R1,power,solarPV,newcapa,2050 -A2,2.86670000000,R1,2035,R1,power,solarPV,newcapa,2050 -A2,6.10000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A2,8.25630000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A2,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,5.44990000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,0.00790000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.08330000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,0.41670000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,2.50000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,2.90630000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,0.75000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,0.70830000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2050 +A2,0.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A2,1.58330000000,R1,2035,R1,power,solarPV,newcapa,2050 +A2,3.20830000000,R1,2040,R1,power,solarPV,newcapa,2050 +A2,8.15620000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv index 89aff9c4a..917f816f5 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,8.98640000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.69150000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,6.60550000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,6.16680000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,8.98640000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.69150000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,6.60550000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,6.16680000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,8.98640000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.69150000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,6.60550000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,6.16680000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,8.98640000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.69150000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,6.60550000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,6.16680000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,8.98640000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.69150000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.60550000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,6.16680000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,8.98640000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.69150000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.60550000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,6.16680000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,8.67450000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,8.67270000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.95860000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.31310000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,8.67450000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,8.67270000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.95860000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.31310000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,8.67450000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,8.67270000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.95860000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.31310000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,8.67450000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,8.67270000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.95860000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.31310000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,8.67450000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,8.67270000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.95860000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.31310000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,8.67450000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,8.67270000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.95860000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.31310000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,10.71990000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.15800000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,7.70370000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.08230000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,10.71990000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,11.15800000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,7.70370000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.08230000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,10.71990000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.15800000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,7.70370000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.08230000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,10.71990000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,11.15800000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,7.70370000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.08230000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,10.71990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.15800000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,7.70370000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.08230000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,10.71990000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,11.15800000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.70370000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.08230000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,10.94890000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,12.24270000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.33340000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.46560000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,10.94890000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.24270000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.33340000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.46560000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,10.94890000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,12.24270000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.33340000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.46560000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,10.94890000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.24270000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.33340000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.46560000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,10.94890000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,12.24270000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,8.33340000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.46560000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,10.94890000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,12.24270000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.33340000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.46560000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,9.91870000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,12.28450000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,4.20800000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,11.28780000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,9.91870000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.28450000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,4.20800000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,11.28780000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,9.91870000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,12.28450000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,4.20800000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,11.28780000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,9.91870000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.28450000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,4.20800000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,11.28780000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.91870000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,12.28450000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,4.20800000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.28780000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,9.91870000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,12.28450000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.20800000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,11.28780000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,9.81810000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,11.60260000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,4.16780000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.97710000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,9.81810000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.60260000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,4.16780000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.97710000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,9.81810000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,11.60260000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,4.16780000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.97710000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,9.81810000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.60260000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,4.16780000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.97710000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.81810000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,11.60260000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,4.16780000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.97710000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,9.81810000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,11.60260000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.16780000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.97710000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv index 161a4e35a..e46424887 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv @@ -1,16 +1,16 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,1.80560000000 -0,2030,R1,gasCCGT,2020,0.80560000000 -0,2035,R1,gasCCGT,2020,0.80560000000 -0,2040,R1,gasCCGT,2020,0.80560000000 -0,2045,R1,gasCCGT,2020,0.80560000000 -0,2049,R1,gasCCGT,2020,0.80560000000 -0,2050,R1,gasCCGT,2020,0.80560000000 -0,2059,R1,gasCCGT,2020,0.80560000000 -1,2025,R1,windturbine,2020,1.81250000000 -1,2030,R1,windturbine,2020,1.81250000000 -1,2035,R1,windturbine,2020,1.81250000000 -1,2040,R1,windturbine,2020,1.81250000000 -1,2045,R1,windturbine,2020,1.81250000000 -1,2049,R1,windturbine,2020,1.81250000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2025,R1,windturbine,2020,2.31250000000 +1,2030,R1,windturbine,2020,2.31250000000 +1,2035,R1,windturbine,2020,2.31250000000 +1,2040,R1,windturbine,2020,2.31250000000 +1,2045,R1,windturbine,2020,2.31250000000 +1,2049,R1,windturbine,2020,2.31250000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv index f894db695..91337e9b2 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv @@ -1,36 +1,36 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,1.80560000000 -0,2030,R1,gasCCGT,2020,0.80560000000 -0,2035,R1,gasCCGT,2020,0.80560000000 -0,2040,R1,gasCCGT,2020,0.80560000000 -0,2045,R1,gasCCGT,2020,0.80560000000 -0,2049,R1,gasCCGT,2020,0.80560000000 -0,2050,R1,gasCCGT,2020,0.80560000000 -0,2054,R1,gasCCGT,2020,0.80560000000 -0,2055,R1,gasCCGT,2020,0.80560000000 -0,2059,R1,gasCCGT,2020,0.80560000000 -1,2030,R1,gasCCGT,2025,3.75000000000 -1,2035,R1,gasCCGT,2025,3.75000000000 -1,2040,R1,gasCCGT,2025,3.75000000000 -1,2045,R1,gasCCGT,2025,3.75000000000 -1,2049,R1,gasCCGT,2025,3.75000000000 -1,2050,R1,gasCCGT,2025,3.75000000000 -1,2054,R1,gasCCGT,2025,3.75000000000 -1,2055,R1,gasCCGT,2025,3.75000000000 -1,2059,R1,gasCCGT,2025,3.75000000000 -1,2060,R1,gasCCGT,2025,3.75000000000 -1,2064,R1,gasCCGT,2025,3.75000000000 -2,2030,R1,solarPV,2025,8.43750000000 -2,2035,R1,solarPV,2025,8.43750000000 -2,2040,R1,solarPV,2025,8.43750000000 -2,2045,R1,solarPV,2025,8.43750000000 -2,2049,R1,solarPV,2025,8.43750000000 -2,2050,R1,solarPV,2025,8.43750000000 -2,2054,R1,solarPV,2025,8.43750000000 -3,2025,R1,windturbine,2020,1.81250000000 -3,2030,R1,windturbine,2020,1.81250000000 -3,2035,R1,windturbine,2020,1.81250000000 -3,2040,R1,windturbine,2020,1.81250000000 -3,2045,R1,windturbine,2020,1.81250000000 -3,2049,R1,windturbine,2020,1.81250000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,3.19440000000 +1,2035,R1,gasCCGT,2025,3.19440000000 +1,2040,R1,gasCCGT,2025,3.19440000000 +1,2045,R1,gasCCGT,2025,3.19440000000 +1,2049,R1,gasCCGT,2025,3.19440000000 +1,2050,R1,gasCCGT,2025,3.19440000000 +1,2054,R1,gasCCGT,2025,3.19440000000 +1,2055,R1,gasCCGT,2025,3.19440000000 +1,2059,R1,gasCCGT,2025,3.19440000000 +1,2060,R1,gasCCGT,2025,3.19440000000 +1,2064,R1,gasCCGT,2025,3.19440000000 +2,2030,R1,solarPV,2025,7.18750000000 +2,2035,R1,solarPV,2025,7.18750000000 +2,2040,R1,solarPV,2025,7.18750000000 +2,2045,R1,solarPV,2025,7.18750000000 +2,2049,R1,solarPV,2025,7.18750000000 +2,2050,R1,solarPV,2025,7.18750000000 +2,2054,R1,solarPV,2025,7.18750000000 +3,2025,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2020,2.31250000000 +3,2035,R1,windturbine,2020,2.31250000000 +3,2040,R1,windturbine,2020,2.31250000000 +3,2045,R1,windturbine,2020,2.31250000000 +3,2049,R1,windturbine,2020,2.31250000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv index b5cca37da..82b8c326c 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv @@ -1,44 +1,44 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,1.80560000000 -0,2030,R1,gasCCGT,2020,0.80560000000 -0,2035,R1,gasCCGT,2020,0.80560000000 -0,2040,R1,gasCCGT,2020,0.80560000000 -0,2045,R1,gasCCGT,2020,0.80560000000 -0,2049,R1,gasCCGT,2020,0.80560000000 -0,2050,R1,gasCCGT,2020,0.80560000000 -0,2054,R1,gasCCGT,2020,0.80560000000 -0,2055,R1,gasCCGT,2020,0.80560000000 -0,2059,R1,gasCCGT,2020,0.80560000000 -1,2030,R1,gasCCGT,2025,3.75000000000 -1,2035,R1,gasCCGT,2025,3.75000000000 -1,2040,R1,gasCCGT,2025,3.75000000000 -1,2045,R1,gasCCGT,2025,3.75000000000 -1,2049,R1,gasCCGT,2025,3.75000000000 -1,2050,R1,gasCCGT,2025,3.75000000000 -1,2054,R1,gasCCGT,2025,3.75000000000 -1,2055,R1,gasCCGT,2025,3.75000000000 -1,2059,R1,gasCCGT,2025,3.75000000000 -1,2060,R1,gasCCGT,2025,3.75000000000 -1,2064,R1,gasCCGT,2025,3.75000000000 -2,2030,R1,solarPV,2025,8.43750000000 -2,2035,R1,solarPV,2025,8.43750000000 -2,2040,R1,solarPV,2025,8.43750000000 -2,2045,R1,solarPV,2025,8.43750000000 -2,2049,R1,solarPV,2025,8.43750000000 -2,2050,R1,solarPV,2025,8.43750000000 -2,2054,R1,solarPV,2025,8.43750000000 -3,2035,R1,solarPV,2030,1.36670000000 -3,2040,R1,solarPV,2030,1.36670000000 -3,2045,R1,solarPV,2030,1.36670000000 -3,2049,R1,solarPV,2030,1.36670000000 -3,2050,R1,solarPV,2030,1.36670000000 -3,2054,R1,solarPV,2030,1.36670000000 -3,2055,R1,solarPV,2030,1.36670000000 -3,2059,R1,solarPV,2030,1.36670000000 -4,2025,R1,windturbine,2020,1.81250000000 -4,2030,R1,windturbine,2020,1.81250000000 -4,2035,R1,windturbine,2020,1.81250000000 -4,2040,R1,windturbine,2020,1.81250000000 -4,2045,R1,windturbine,2020,1.81250000000 -4,2049,R1,windturbine,2020,1.81250000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,3.19440000000 +1,2035,R1,gasCCGT,2025,3.19440000000 +1,2040,R1,gasCCGT,2025,3.19440000000 +1,2045,R1,gasCCGT,2025,3.19440000000 +1,2049,R1,gasCCGT,2025,3.19440000000 +1,2050,R1,gasCCGT,2025,3.19440000000 +1,2054,R1,gasCCGT,2025,3.19440000000 +1,2055,R1,gasCCGT,2025,3.19440000000 +1,2059,R1,gasCCGT,2025,3.19440000000 +1,2060,R1,gasCCGT,2025,3.19440000000 +1,2064,R1,gasCCGT,2025,3.19440000000 +2,2030,R1,solarPV,2025,7.18750000000 +2,2035,R1,solarPV,2025,7.18750000000 +2,2040,R1,solarPV,2025,7.18750000000 +2,2045,R1,solarPV,2025,7.18750000000 +2,2049,R1,solarPV,2025,7.18750000000 +2,2050,R1,solarPV,2025,7.18750000000 +2,2054,R1,solarPV,2025,7.18750000000 +3,2035,R1,solarPV,2030,0.33330000000 +3,2040,R1,solarPV,2030,0.33330000000 +3,2045,R1,solarPV,2030,0.33330000000 +3,2049,R1,solarPV,2030,0.33330000000 +3,2050,R1,solarPV,2030,0.33330000000 +3,2054,R1,solarPV,2030,0.33330000000 +3,2055,R1,solarPV,2030,0.33330000000 +3,2059,R1,solarPV,2030,0.33330000000 +4,2025,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2020,2.31250000000 +4,2035,R1,windturbine,2020,2.31250000000 +4,2040,R1,windturbine,2020,2.31250000000 +4,2045,R1,windturbine,2020,2.31250000000 +4,2049,R1,windturbine,2020,2.31250000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv index 3e7000cd4..7eaa96be1 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv @@ -1,62 +1,62 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,1.80560000000 -0,2030,R1,gasCCGT,2020,0.80560000000 -0,2035,R1,gasCCGT,2020,0.80560000000 -0,2040,R1,gasCCGT,2020,0.80560000000 -0,2045,R1,gasCCGT,2020,0.80560000000 -0,2049,R1,gasCCGT,2020,0.80560000000 -0,2050,R1,gasCCGT,2020,0.80560000000 -0,2054,R1,gasCCGT,2020,0.80560000000 -0,2055,R1,gasCCGT,2020,0.80560000000 -0,2059,R1,gasCCGT,2020,0.80560000000 -1,2030,R1,gasCCGT,2025,3.75000000000 -1,2035,R1,gasCCGT,2025,3.75000000000 -1,2040,R1,gasCCGT,2025,3.75000000000 -1,2045,R1,gasCCGT,2025,3.75000000000 -1,2049,R1,gasCCGT,2025,3.75000000000 -1,2050,R1,gasCCGT,2025,3.75000000000 -1,2054,R1,gasCCGT,2025,3.75000000000 -1,2055,R1,gasCCGT,2025,3.75000000000 -1,2059,R1,gasCCGT,2025,3.75000000000 -1,2060,R1,gasCCGT,2025,3.75000000000 -1,2064,R1,gasCCGT,2025,3.75000000000 -2,2030,R1,solarPV,2025,8.43750000000 -2,2035,R1,solarPV,2025,8.43750000000 -2,2040,R1,solarPV,2025,8.43750000000 -2,2045,R1,solarPV,2025,8.43750000000 -2,2049,R1,solarPV,2025,8.43750000000 -2,2050,R1,solarPV,2025,8.43750000000 -2,2054,R1,solarPV,2025,8.43750000000 -3,2035,R1,solarPV,2030,1.36670000000 -3,2040,R1,solarPV,2030,1.36670000000 -3,2045,R1,solarPV,2030,1.36670000000 -3,2049,R1,solarPV,2030,1.36670000000 -3,2050,R1,solarPV,2030,1.36670000000 -3,2054,R1,solarPV,2030,1.36670000000 -3,2055,R1,solarPV,2030,1.36670000000 -3,2059,R1,solarPV,2030,1.36670000000 -4,2040,R1,solarPV,2035,4.57500000000 -4,2045,R1,solarPV,2035,4.57500000000 -4,2049,R1,solarPV,2035,4.57500000000 -4,2050,R1,solarPV,2035,4.57500000000 -4,2054,R1,solarPV,2035,4.57500000000 -4,2055,R1,solarPV,2035,4.57500000000 -4,2059,R1,solarPV,2035,4.57500000000 -4,2060,R1,solarPV,2035,4.57500000000 -4,2064,R1,solarPV,2035,4.57500000000 -5,2025,R1,windturbine,2020,1.81250000000 -5,2030,R1,windturbine,2020,1.81250000000 -5,2035,R1,windturbine,2020,1.81250000000 -5,2040,R1,windturbine,2020,1.81250000000 -5,2045,R1,windturbine,2020,1.81250000000 -5,2049,R1,windturbine,2020,1.81250000000 -6,2040,R1,windturbine,2035,0.65830000000 -6,2045,R1,windturbine,2035,0.65830000000 -6,2049,R1,windturbine,2035,0.65830000000 -6,2050,R1,windturbine,2035,0.65830000000 -6,2054,R1,windturbine,2035,0.65830000000 -6,2055,R1,windturbine,2035,0.65830000000 -6,2059,R1,windturbine,2035,0.65830000000 -6,2060,R1,windturbine,2035,0.65830000000 -6,2064,R1,windturbine,2035,0.65830000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,3.19440000000 +1,2035,R1,gasCCGT,2025,3.19440000000 +1,2040,R1,gasCCGT,2025,3.19440000000 +1,2045,R1,gasCCGT,2025,3.19440000000 +1,2049,R1,gasCCGT,2025,3.19440000000 +1,2050,R1,gasCCGT,2025,3.19440000000 +1,2054,R1,gasCCGT,2025,3.19440000000 +1,2055,R1,gasCCGT,2025,3.19440000000 +1,2059,R1,gasCCGT,2025,3.19440000000 +1,2060,R1,gasCCGT,2025,3.19440000000 +1,2064,R1,gasCCGT,2025,3.19440000000 +2,2030,R1,solarPV,2025,7.18750000000 +2,2035,R1,solarPV,2025,7.18750000000 +2,2040,R1,solarPV,2025,7.18750000000 +2,2045,R1,solarPV,2025,7.18750000000 +2,2049,R1,solarPV,2025,7.18750000000 +2,2050,R1,solarPV,2025,7.18750000000 +2,2054,R1,solarPV,2025,7.18750000000 +3,2035,R1,solarPV,2030,0.33330000000 +3,2040,R1,solarPV,2030,0.33330000000 +3,2045,R1,solarPV,2030,0.33330000000 +3,2049,R1,solarPV,2030,0.33330000000 +3,2050,R1,solarPV,2030,0.33330000000 +3,2054,R1,solarPV,2030,0.33330000000 +3,2055,R1,solarPV,2030,0.33330000000 +3,2059,R1,solarPV,2030,0.33330000000 +4,2040,R1,solarPV,2035,2.00000000000 +4,2045,R1,solarPV,2035,2.00000000000 +4,2049,R1,solarPV,2035,2.00000000000 +4,2050,R1,solarPV,2035,2.00000000000 +4,2054,R1,solarPV,2035,2.00000000000 +4,2055,R1,solarPV,2035,2.00000000000 +4,2059,R1,solarPV,2035,2.00000000000 +4,2060,R1,solarPV,2035,2.00000000000 +4,2064,R1,solarPV,2035,2.00000000000 +5,2025,R1,windturbine,2020,2.31250000000 +5,2030,R1,windturbine,2020,2.31250000000 +5,2035,R1,windturbine,2020,2.31250000000 +5,2040,R1,windturbine,2020,2.31250000000 +5,2045,R1,windturbine,2020,2.31250000000 +5,2049,R1,windturbine,2020,2.31250000000 +6,2040,R1,windturbine,2035,0.75000000000 +6,2045,R1,windturbine,2035,0.75000000000 +6,2049,R1,windturbine,2035,0.75000000000 +6,2050,R1,windturbine,2035,0.75000000000 +6,2054,R1,windturbine,2035,0.75000000000 +6,2055,R1,windturbine,2035,0.75000000000 +6,2059,R1,windturbine,2035,0.75000000000 +6,2060,R1,windturbine,2035,0.75000000000 +6,2064,R1,windturbine,2035,0.75000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv index 5d49eeed1..94ba0b038 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv @@ -1,72 +1,82 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,1.80560000000 -0,2030,R1,gasCCGT,2020,0.80560000000 -0,2035,R1,gasCCGT,2020,0.80560000000 -0,2040,R1,gasCCGT,2020,0.80560000000 -0,2045,R1,gasCCGT,2020,0.80560000000 -0,2049,R1,gasCCGT,2020,0.80560000000 -0,2050,R1,gasCCGT,2020,0.80560000000 -0,2054,R1,gasCCGT,2020,0.80560000000 -0,2055,R1,gasCCGT,2020,0.80560000000 -0,2059,R1,gasCCGT,2020,0.80560000000 -1,2030,R1,gasCCGT,2025,3.75000000000 -1,2035,R1,gasCCGT,2025,3.75000000000 -1,2040,R1,gasCCGT,2025,3.75000000000 -1,2045,R1,gasCCGT,2025,3.75000000000 -1,2049,R1,gasCCGT,2025,3.75000000000 -1,2050,R1,gasCCGT,2025,3.75000000000 -1,2054,R1,gasCCGT,2025,3.75000000000 -1,2055,R1,gasCCGT,2025,3.75000000000 -1,2059,R1,gasCCGT,2025,3.75000000000 -1,2060,R1,gasCCGT,2025,3.75000000000 -1,2064,R1,gasCCGT,2025,3.75000000000 -2,2030,R1,solarPV,2025,8.43750000000 -2,2035,R1,solarPV,2025,8.43750000000 -2,2040,R1,solarPV,2025,8.43750000000 -2,2045,R1,solarPV,2025,8.43750000000 -2,2049,R1,solarPV,2025,8.43750000000 -2,2050,R1,solarPV,2025,8.43750000000 -2,2054,R1,solarPV,2025,8.43750000000 -3,2035,R1,solarPV,2030,1.36670000000 -3,2040,R1,solarPV,2030,1.36670000000 -3,2045,R1,solarPV,2030,1.36670000000 -3,2049,R1,solarPV,2030,1.36670000000 -3,2050,R1,solarPV,2030,1.36670000000 -3,2054,R1,solarPV,2030,1.36670000000 -3,2055,R1,solarPV,2030,1.36670000000 -3,2059,R1,solarPV,2030,1.36670000000 -4,2040,R1,solarPV,2035,4.57500000000 -4,2045,R1,solarPV,2035,4.57500000000 -4,2049,R1,solarPV,2035,4.57500000000 -4,2050,R1,solarPV,2035,4.57500000000 -4,2054,R1,solarPV,2035,4.57500000000 -4,2055,R1,solarPV,2035,4.57500000000 -4,2059,R1,solarPV,2035,4.57500000000 -4,2060,R1,solarPV,2035,4.57500000000 -4,2064,R1,solarPV,2035,4.57500000000 -5,2045,R1,solarPV,2040,12.20000000000 -5,2049,R1,solarPV,2040,12.20000000000 -5,2050,R1,solarPV,2040,12.20000000000 -5,2054,R1,solarPV,2040,12.20000000000 -5,2055,R1,solarPV,2040,12.20000000000 -5,2059,R1,solarPV,2040,12.20000000000 -5,2060,R1,solarPV,2040,12.20000000000 -5,2064,R1,solarPV,2040,12.20000000000 -5,2065,R1,solarPV,2040,12.20000000000 -5,2069,R1,solarPV,2040,12.20000000000 -6,2025,R1,windturbine,2020,1.81250000000 -6,2030,R1,windturbine,2020,1.81250000000 -6,2035,R1,windturbine,2020,1.81250000000 -6,2040,R1,windturbine,2020,1.81250000000 -6,2045,R1,windturbine,2020,1.81250000000 -6,2049,R1,windturbine,2020,1.81250000000 -7,2040,R1,windturbine,2035,0.65830000000 -7,2045,R1,windturbine,2035,0.65830000000 -7,2049,R1,windturbine,2035,0.65830000000 -7,2050,R1,windturbine,2035,0.65830000000 -7,2054,R1,windturbine,2035,0.65830000000 -7,2055,R1,windturbine,2035,0.65830000000 -7,2059,R1,windturbine,2035,0.65830000000 -7,2060,R1,windturbine,2035,0.65830000000 -7,2064,R1,windturbine,2035,0.65830000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,3.19440000000 +1,2035,R1,gasCCGT,2025,3.19440000000 +1,2040,R1,gasCCGT,2025,3.19440000000 +1,2045,R1,gasCCGT,2025,3.19440000000 +1,2049,R1,gasCCGT,2025,3.19440000000 +1,2050,R1,gasCCGT,2025,3.19440000000 +1,2054,R1,gasCCGT,2025,3.19440000000 +1,2055,R1,gasCCGT,2025,3.19440000000 +1,2059,R1,gasCCGT,2025,3.19440000000 +1,2060,R1,gasCCGT,2025,3.19440000000 +1,2064,R1,gasCCGT,2025,3.19440000000 +2,2030,R1,solarPV,2025,7.18750000000 +2,2035,R1,solarPV,2025,7.18750000000 +2,2040,R1,solarPV,2025,7.18750000000 +2,2045,R1,solarPV,2025,7.18750000000 +2,2049,R1,solarPV,2025,7.18750000000 +2,2050,R1,solarPV,2025,7.18750000000 +2,2054,R1,solarPV,2025,7.18750000000 +3,2035,R1,solarPV,2030,0.33330000000 +3,2040,R1,solarPV,2030,0.33330000000 +3,2045,R1,solarPV,2030,0.33330000000 +3,2049,R1,solarPV,2030,0.33330000000 +3,2050,R1,solarPV,2030,0.33330000000 +3,2054,R1,solarPV,2030,0.33330000000 +3,2055,R1,solarPV,2030,0.33330000000 +3,2059,R1,solarPV,2030,0.33330000000 +4,2040,R1,solarPV,2035,2.00000000000 +4,2045,R1,solarPV,2035,2.00000000000 +4,2049,R1,solarPV,2035,2.00000000000 +4,2050,R1,solarPV,2035,2.00000000000 +4,2054,R1,solarPV,2035,2.00000000000 +4,2055,R1,solarPV,2035,2.00000000000 +4,2059,R1,solarPV,2035,2.00000000000 +4,2060,R1,solarPV,2035,2.00000000000 +4,2064,R1,solarPV,2035,2.00000000000 +5,2045,R1,solarPV,2040,5.70830000000 +5,2049,R1,solarPV,2040,5.70830000000 +5,2050,R1,solarPV,2040,5.70830000000 +5,2054,R1,solarPV,2040,5.70830000000 +5,2055,R1,solarPV,2040,5.70830000000 +5,2059,R1,solarPV,2040,5.70830000000 +5,2060,R1,solarPV,2040,5.70830000000 +5,2064,R1,solarPV,2040,5.70830000000 +5,2065,R1,solarPV,2040,5.70830000000 +5,2069,R1,solarPV,2040,5.70830000000 +6,2025,R1,windturbine,2020,2.31250000000 +6,2030,R1,windturbine,2020,2.31250000000 +6,2035,R1,windturbine,2020,2.31250000000 +6,2040,R1,windturbine,2020,2.31250000000 +6,2045,R1,windturbine,2020,2.31250000000 +6,2049,R1,windturbine,2020,2.31250000000 +7,2040,R1,windturbine,2035,0.75000000000 +7,2045,R1,windturbine,2035,0.75000000000 +7,2049,R1,windturbine,2035,0.75000000000 +7,2050,R1,windturbine,2035,0.75000000000 +7,2054,R1,windturbine,2035,0.75000000000 +7,2055,R1,windturbine,2035,0.75000000000 +7,2059,R1,windturbine,2035,0.75000000000 +7,2060,R1,windturbine,2035,0.75000000000 +7,2064,R1,windturbine,2035,0.75000000000 +8,2045,R1,windturbine,2040,0.70830000000 +8,2049,R1,windturbine,2040,0.70830000000 +8,2050,R1,windturbine,2040,0.70830000000 +8,2054,R1,windturbine,2040,0.70830000000 +8,2055,R1,windturbine,2040,0.70830000000 +8,2059,R1,windturbine,2040,0.70830000000 +8,2060,R1,windturbine,2040,0.70830000000 +8,2064,R1,windturbine,2040,0.70830000000 +8,2065,R1,windturbine,2040,0.70830000000 +8,2069,R1,windturbine,2040,0.70830000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv index 3577f73cd..de815ecc3 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv @@ -1,83 +1,93 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,1.80560000000 -0,2030,R1,gasCCGT,2020,0.80560000000 -0,2035,R1,gasCCGT,2020,0.80560000000 -0,2040,R1,gasCCGT,2020,0.80560000000 -0,2045,R1,gasCCGT,2020,0.80560000000 -0,2049,R1,gasCCGT,2020,0.80560000000 -0,2050,R1,gasCCGT,2020,0.80560000000 -0,2054,R1,gasCCGT,2020,0.80560000000 -0,2055,R1,gasCCGT,2020,0.80560000000 -0,2059,R1,gasCCGT,2020,0.80560000000 -1,2030,R1,gasCCGT,2025,3.75000000000 -1,2035,R1,gasCCGT,2025,3.75000000000 -1,2040,R1,gasCCGT,2025,3.75000000000 -1,2045,R1,gasCCGT,2025,3.75000000000 -1,2049,R1,gasCCGT,2025,3.75000000000 -1,2050,R1,gasCCGT,2025,3.75000000000 -1,2054,R1,gasCCGT,2025,3.75000000000 -1,2055,R1,gasCCGT,2025,3.75000000000 -1,2059,R1,gasCCGT,2025,3.75000000000 -1,2060,R1,gasCCGT,2025,3.75000000000 -1,2064,R1,gasCCGT,2025,3.75000000000 -2,2030,R1,solarPV,2025,8.43750000000 -2,2035,R1,solarPV,2025,8.43750000000 -2,2040,R1,solarPV,2025,8.43750000000 -2,2045,R1,solarPV,2025,8.43750000000 -2,2049,R1,solarPV,2025,8.43750000000 -2,2050,R1,solarPV,2025,8.43750000000 -2,2054,R1,solarPV,2025,8.43750000000 -3,2035,R1,solarPV,2030,1.36670000000 -3,2040,R1,solarPV,2030,1.36670000000 -3,2045,R1,solarPV,2030,1.36670000000 -3,2049,R1,solarPV,2030,1.36670000000 -3,2050,R1,solarPV,2030,1.36670000000 -3,2054,R1,solarPV,2030,1.36670000000 -3,2055,R1,solarPV,2030,1.36670000000 -3,2059,R1,solarPV,2030,1.36670000000 -4,2040,R1,solarPV,2035,4.57500000000 -4,2045,R1,solarPV,2035,4.57500000000 -4,2049,R1,solarPV,2035,4.57500000000 -4,2050,R1,solarPV,2035,4.57500000000 -4,2054,R1,solarPV,2035,4.57500000000 -4,2055,R1,solarPV,2035,4.57500000000 -4,2059,R1,solarPV,2035,4.57500000000 -4,2060,R1,solarPV,2035,4.57500000000 -4,2064,R1,solarPV,2035,4.57500000000 -5,2045,R1,solarPV,2040,12.20000000000 -5,2049,R1,solarPV,2040,12.20000000000 -5,2050,R1,solarPV,2040,12.20000000000 -5,2054,R1,solarPV,2040,12.20000000000 -5,2055,R1,solarPV,2040,12.20000000000 -5,2059,R1,solarPV,2040,12.20000000000 -5,2060,R1,solarPV,2040,12.20000000000 -5,2064,R1,solarPV,2040,12.20000000000 -5,2065,R1,solarPV,2040,12.20000000000 -5,2069,R1,solarPV,2040,12.20000000000 -6,2049,R1,solarPV,2045,2.40000000000 -6,2050,R1,solarPV,2045,11.25630000000 -6,2054,R1,solarPV,2045,11.25630000000 -6,2055,R1,solarPV,2045,11.25630000000 -6,2059,R1,solarPV,2045,11.25630000000 -6,2060,R1,solarPV,2045,11.25630000000 -6,2064,R1,solarPV,2045,11.25630000000 -6,2065,R1,solarPV,2045,11.25630000000 -6,2069,R1,solarPV,2045,11.25630000000 -6,2070,R1,solarPV,2045,11.25630000000 -6,2074,R1,solarPV,2045,11.25630000000 -7,2025,R1,windturbine,2020,1.81250000000 -7,2030,R1,windturbine,2020,1.81250000000 -7,2035,R1,windturbine,2020,1.81250000000 -7,2040,R1,windturbine,2020,1.81250000000 -7,2045,R1,windturbine,2020,1.81250000000 -7,2049,R1,windturbine,2020,1.81250000000 -8,2040,R1,windturbine,2035,0.65830000000 -8,2045,R1,windturbine,2035,0.65830000000 -8,2049,R1,windturbine,2035,0.65830000000 -8,2050,R1,windturbine,2035,0.65830000000 -8,2054,R1,windturbine,2035,0.65830000000 -8,2055,R1,windturbine,2035,0.65830000000 -8,2059,R1,windturbine,2035,0.65830000000 -8,2060,R1,windturbine,2035,0.65830000000 -8,2064,R1,windturbine,2035,0.65830000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,3.19440000000 +1,2035,R1,gasCCGT,2025,3.19440000000 +1,2040,R1,gasCCGT,2025,3.19440000000 +1,2045,R1,gasCCGT,2025,3.19440000000 +1,2049,R1,gasCCGT,2025,3.19440000000 +1,2050,R1,gasCCGT,2025,3.19440000000 +1,2054,R1,gasCCGT,2025,3.19440000000 +1,2055,R1,gasCCGT,2025,3.19440000000 +1,2059,R1,gasCCGT,2025,3.19440000000 +1,2060,R1,gasCCGT,2025,3.19440000000 +1,2064,R1,gasCCGT,2025,3.19440000000 +2,2030,R1,solarPV,2025,7.18750000000 +2,2035,R1,solarPV,2025,7.18750000000 +2,2040,R1,solarPV,2025,7.18750000000 +2,2045,R1,solarPV,2025,7.18750000000 +2,2049,R1,solarPV,2025,7.18750000000 +2,2050,R1,solarPV,2025,7.18750000000 +2,2054,R1,solarPV,2025,7.18750000000 +3,2035,R1,solarPV,2030,0.33330000000 +3,2040,R1,solarPV,2030,0.33330000000 +3,2045,R1,solarPV,2030,0.33330000000 +3,2049,R1,solarPV,2030,0.33330000000 +3,2050,R1,solarPV,2030,0.33330000000 +3,2054,R1,solarPV,2030,0.33330000000 +3,2055,R1,solarPV,2030,0.33330000000 +3,2059,R1,solarPV,2030,0.33330000000 +4,2040,R1,solarPV,2035,2.00000000000 +4,2045,R1,solarPV,2035,2.00000000000 +4,2049,R1,solarPV,2035,2.00000000000 +4,2050,R1,solarPV,2035,2.00000000000 +4,2054,R1,solarPV,2035,2.00000000000 +4,2055,R1,solarPV,2035,2.00000000000 +4,2059,R1,solarPV,2035,2.00000000000 +4,2060,R1,solarPV,2035,2.00000000000 +4,2064,R1,solarPV,2035,2.00000000000 +5,2045,R1,solarPV,2040,5.70830000000 +5,2049,R1,solarPV,2040,5.70830000000 +5,2050,R1,solarPV,2040,5.70830000000 +5,2054,R1,solarPV,2040,5.70830000000 +5,2055,R1,solarPV,2040,5.70830000000 +5,2059,R1,solarPV,2040,5.70830000000 +5,2060,R1,solarPV,2040,5.70830000000 +5,2064,R1,solarPV,2040,5.70830000000 +5,2065,R1,solarPV,2040,5.70830000000 +5,2069,R1,solarPV,2040,5.70830000000 +6,2049,R1,solarPV,2045,2.32500000000 +6,2050,R1,solarPV,2045,11.06250000000 +6,2054,R1,solarPV,2045,11.06250000000 +6,2055,R1,solarPV,2045,11.06250000000 +6,2059,R1,solarPV,2045,11.06250000000 +6,2060,R1,solarPV,2045,11.06250000000 +6,2064,R1,solarPV,2045,11.06250000000 +6,2065,R1,solarPV,2045,11.06250000000 +6,2069,R1,solarPV,2045,11.06250000000 +6,2070,R1,solarPV,2045,11.06250000000 +6,2074,R1,solarPV,2045,11.06250000000 +7,2025,R1,windturbine,2020,2.31250000000 +7,2030,R1,windturbine,2020,2.31250000000 +7,2035,R1,windturbine,2020,2.31250000000 +7,2040,R1,windturbine,2020,2.31250000000 +7,2045,R1,windturbine,2020,2.31250000000 +7,2049,R1,windturbine,2020,2.31250000000 +8,2040,R1,windturbine,2035,0.75000000000 +8,2045,R1,windturbine,2035,0.75000000000 +8,2049,R1,windturbine,2035,0.75000000000 +8,2050,R1,windturbine,2035,0.75000000000 +8,2054,R1,windturbine,2035,0.75000000000 +8,2055,R1,windturbine,2035,0.75000000000 +8,2059,R1,windturbine,2035,0.75000000000 +8,2060,R1,windturbine,2035,0.75000000000 +8,2064,R1,windturbine,2035,0.75000000000 +9,2045,R1,windturbine,2040,0.70830000000 +9,2049,R1,windturbine,2040,0.70830000000 +9,2050,R1,windturbine,2040,0.70830000000 +9,2054,R1,windturbine,2040,0.70830000000 +9,2055,R1,windturbine,2040,0.70830000000 +9,2059,R1,windturbine,2040,0.70830000000 +9,2060,R1,windturbine,2040,0.70830000000 +9,2064,R1,windturbine,2040,0.70830000000 +9,2065,R1,windturbine,2040,0.70830000000 +9,2069,R1,windturbine,2040,0.70830000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv index b8a792346..b24aa57cc 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv @@ -1,103 +1,126 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasCCGT,2020,1.00000000000 -0,2025,R1,gasCCGT,2020,1.80560000000 -0,2030,R1,gasCCGT,2020,0.80560000000 -0,2035,R1,gasCCGT,2020,0.80560000000 -0,2040,R1,gasCCGT,2020,0.80560000000 -0,2045,R1,gasCCGT,2020,0.80560000000 -0,2049,R1,gasCCGT,2020,0.80560000000 -0,2050,R1,gasCCGT,2020,0.80560000000 -0,2054,R1,gasCCGT,2020,0.80560000000 -0,2055,R1,gasCCGT,2020,0.80560000000 -0,2059,R1,gasCCGT,2020,0.80560000000 -1,2030,R1,gasCCGT,2025,3.75000000000 -1,2035,R1,gasCCGT,2025,3.75000000000 -1,2040,R1,gasCCGT,2025,3.75000000000 -1,2045,R1,gasCCGT,2025,3.75000000000 -1,2049,R1,gasCCGT,2025,3.75000000000 -1,2050,R1,gasCCGT,2025,3.75000000000 -1,2054,R1,gasCCGT,2025,3.75000000000 -1,2055,R1,gasCCGT,2025,3.75000000000 -1,2059,R1,gasCCGT,2025,3.75000000000 -1,2060,R1,gasCCGT,2025,3.75000000000 -1,2064,R1,gasCCGT,2025,3.75000000000 -2,2030,R1,solarPV,2025,8.43750000000 -2,2035,R1,solarPV,2025,8.43750000000 -2,2040,R1,solarPV,2025,8.43750000000 -2,2045,R1,solarPV,2025,8.43750000000 -2,2049,R1,solarPV,2025,8.43750000000 -2,2050,R1,solarPV,2025,8.43750000000 -2,2054,R1,solarPV,2025,8.43750000000 -3,2035,R1,solarPV,2030,1.36670000000 -3,2040,R1,solarPV,2030,1.36670000000 -3,2045,R1,solarPV,2030,1.36670000000 -3,2049,R1,solarPV,2030,1.36670000000 -3,2050,R1,solarPV,2030,1.36670000000 -3,2054,R1,solarPV,2030,1.36670000000 -3,2055,R1,solarPV,2030,1.36670000000 -3,2059,R1,solarPV,2030,1.36670000000 -4,2040,R1,solarPV,2035,4.57500000000 -4,2045,R1,solarPV,2035,4.57500000000 -4,2049,R1,solarPV,2035,4.57500000000 -4,2050,R1,solarPV,2035,4.57500000000 -4,2054,R1,solarPV,2035,4.57500000000 -4,2055,R1,solarPV,2035,4.57500000000 -4,2059,R1,solarPV,2035,4.57500000000 -4,2060,R1,solarPV,2035,4.57500000000 -4,2064,R1,solarPV,2035,4.57500000000 -5,2045,R1,solarPV,2040,12.20000000000 -5,2049,R1,solarPV,2040,12.20000000000 -5,2050,R1,solarPV,2040,12.20000000000 -5,2054,R1,solarPV,2040,12.20000000000 -5,2055,R1,solarPV,2040,12.20000000000 -5,2059,R1,solarPV,2040,12.20000000000 -5,2060,R1,solarPV,2040,12.20000000000 -5,2064,R1,solarPV,2040,12.20000000000 -5,2065,R1,solarPV,2040,12.20000000000 -5,2069,R1,solarPV,2040,12.20000000000 -6,2049,R1,solarPV,2045,2.40000000000 -6,2050,R1,solarPV,2045,11.25630000000 -6,2054,R1,solarPV,2045,11.25630000000 -6,2055,R1,solarPV,2045,11.25630000000 -6,2059,R1,solarPV,2045,11.25630000000 -6,2060,R1,solarPV,2045,11.25630000000 -6,2064,R1,solarPV,2045,11.25630000000 -6,2065,R1,solarPV,2045,11.25630000000 -6,2069,R1,solarPV,2045,11.25630000000 -6,2070,R1,solarPV,2045,11.25630000000 -6,2074,R1,solarPV,2045,11.25630000000 -7,2055,R1,solarPV,2050,10.00000000000 -7,2059,R1,solarPV,2050,10.00000000000 -7,2060,R1,solarPV,2050,10.00000000000 -7,2064,R1,solarPV,2050,10.00000000000 -7,2065,R1,solarPV,2050,10.00000000000 -7,2069,R1,solarPV,2050,10.00000000000 -7,2070,R1,solarPV,2050,10.00000000000 -7,2074,R1,solarPV,2050,10.00000000000 -7,2075,R1,solarPV,2050,10.00000000000 -7,2079,R1,solarPV,2050,10.00000000000 -8,2025,R1,windturbine,2020,1.81250000000 -8,2030,R1,windturbine,2020,1.81250000000 -8,2035,R1,windturbine,2020,1.81250000000 -8,2040,R1,windturbine,2020,1.81250000000 -8,2045,R1,windturbine,2020,1.81250000000 -8,2049,R1,windturbine,2020,1.81250000000 -9,2040,R1,windturbine,2035,0.65830000000 -9,2045,R1,windturbine,2035,0.65830000000 -9,2049,R1,windturbine,2035,0.65830000000 -9,2050,R1,windturbine,2035,0.65830000000 -9,2054,R1,windturbine,2035,0.65830000000 -9,2055,R1,windturbine,2035,0.65830000000 -9,2059,R1,windturbine,2035,0.65830000000 -9,2060,R1,windturbine,2035,0.65830000000 -9,2064,R1,windturbine,2035,0.65830000000 -10,2055,R1,windturbine,2050,7.87600000000 -10,2059,R1,windturbine,2050,7.87600000000 -10,2060,R1,windturbine,2050,7.87600000000 -10,2064,R1,windturbine,2050,7.87600000000 -10,2065,R1,windturbine,2050,7.87600000000 -10,2069,R1,windturbine,2050,7.87600000000 -10,2070,R1,windturbine,2050,7.87600000000 -10,2074,R1,windturbine,2050,7.87600000000 -10,2075,R1,windturbine,2050,7.87600000000 -10,2079,R1,windturbine,2050,7.87600000000 +0,2025,R1,gasCCGT,2020,2.02780000000 +0,2030,R1,gasCCGT,2020,1.02780000000 +0,2035,R1,gasCCGT,2020,1.02780000000 +0,2040,R1,gasCCGT,2020,1.02780000000 +0,2045,R1,gasCCGT,2020,1.02780000000 +0,2049,R1,gasCCGT,2020,1.02780000000 +0,2050,R1,gasCCGT,2020,1.02780000000 +0,2054,R1,gasCCGT,2020,1.02780000000 +0,2055,R1,gasCCGT,2020,1.02780000000 +0,2059,R1,gasCCGT,2020,1.02780000000 +1,2030,R1,gasCCGT,2025,3.19440000000 +1,2035,R1,gasCCGT,2025,3.19440000000 +1,2040,R1,gasCCGT,2025,3.19440000000 +1,2045,R1,gasCCGT,2025,3.19440000000 +1,2049,R1,gasCCGT,2025,3.19440000000 +1,2050,R1,gasCCGT,2025,3.19440000000 +1,2054,R1,gasCCGT,2025,3.19440000000 +1,2055,R1,gasCCGT,2025,3.19440000000 +1,2059,R1,gasCCGT,2025,3.19440000000 +1,2060,R1,gasCCGT,2025,3.19440000000 +1,2064,R1,gasCCGT,2025,3.19440000000 +2,2055,R1,gasCCGT,2050,0.17820000000 +2,2059,R1,gasCCGT,2050,0.17820000000 +2,2060,R1,gasCCGT,2050,0.17820000000 +2,2064,R1,gasCCGT,2050,0.17820000000 +2,2065,R1,gasCCGT,2050,0.17820000000 +2,2069,R1,gasCCGT,2050,0.17820000000 +2,2070,R1,gasCCGT,2050,0.17820000000 +2,2074,R1,gasCCGT,2050,0.17820000000 +2,2075,R1,gasCCGT,2050,0.17820000000 +2,2079,R1,gasCCGT,2050,0.17820000000 +2,2080,R1,gasCCGT,2050,0.17820000000 +2,2089,R1,gasCCGT,2050,0.17820000000 +3,2030,R1,solarPV,2025,7.18750000000 +3,2035,R1,solarPV,2025,7.18750000000 +3,2040,R1,solarPV,2025,7.18750000000 +3,2045,R1,solarPV,2025,7.18750000000 +3,2049,R1,solarPV,2025,7.18750000000 +3,2050,R1,solarPV,2025,7.18750000000 +3,2054,R1,solarPV,2025,7.18750000000 +4,2035,R1,solarPV,2030,0.33330000000 +4,2040,R1,solarPV,2030,0.33330000000 +4,2045,R1,solarPV,2030,0.33330000000 +4,2049,R1,solarPV,2030,0.33330000000 +4,2050,R1,solarPV,2030,0.33330000000 +4,2054,R1,solarPV,2030,0.33330000000 +4,2055,R1,solarPV,2030,0.33330000000 +4,2059,R1,solarPV,2030,0.33330000000 +5,2040,R1,solarPV,2035,2.00000000000 +5,2045,R1,solarPV,2035,2.00000000000 +5,2049,R1,solarPV,2035,2.00000000000 +5,2050,R1,solarPV,2035,2.00000000000 +5,2054,R1,solarPV,2035,2.00000000000 +5,2055,R1,solarPV,2035,2.00000000000 +5,2059,R1,solarPV,2035,2.00000000000 +5,2060,R1,solarPV,2035,2.00000000000 +5,2064,R1,solarPV,2035,2.00000000000 +6,2045,R1,solarPV,2040,5.70830000000 +6,2049,R1,solarPV,2040,5.70830000000 +6,2050,R1,solarPV,2040,5.70830000000 +6,2054,R1,solarPV,2040,5.70830000000 +6,2055,R1,solarPV,2040,5.70830000000 +6,2059,R1,solarPV,2040,5.70830000000 +6,2060,R1,solarPV,2040,5.70830000000 +6,2064,R1,solarPV,2040,5.70830000000 +6,2065,R1,solarPV,2040,5.70830000000 +6,2069,R1,solarPV,2040,5.70830000000 +7,2049,R1,solarPV,2045,2.32500000000 +7,2050,R1,solarPV,2045,11.06250000000 +7,2054,R1,solarPV,2045,11.06250000000 +7,2055,R1,solarPV,2045,11.06250000000 +7,2059,R1,solarPV,2045,11.06250000000 +7,2060,R1,solarPV,2045,11.06250000000 +7,2064,R1,solarPV,2045,11.06250000000 +7,2065,R1,solarPV,2045,11.06250000000 +7,2069,R1,solarPV,2045,11.06250000000 +7,2070,R1,solarPV,2045,11.06250000000 +7,2074,R1,solarPV,2045,11.06250000000 +8,2054,R1,solarPV,2050,4.60000000000 +8,2055,R1,solarPV,2050,15.75000000000 +8,2059,R1,solarPV,2050,15.75000000000 +8,2060,R1,solarPV,2050,15.75000000000 +8,2064,R1,solarPV,2050,15.75000000000 +8,2065,R1,solarPV,2050,15.75000000000 +8,2069,R1,solarPV,2050,15.75000000000 +8,2070,R1,solarPV,2050,15.75000000000 +8,2074,R1,solarPV,2050,15.75000000000 +8,2075,R1,solarPV,2050,15.75000000000 +8,2079,R1,solarPV,2050,15.75000000000 +9,2025,R1,windturbine,2020,2.31250000000 +9,2030,R1,windturbine,2020,2.31250000000 +9,2035,R1,windturbine,2020,2.31250000000 +9,2040,R1,windturbine,2020,2.31250000000 +9,2045,R1,windturbine,2020,2.31250000000 +9,2049,R1,windturbine,2020,2.31250000000 +10,2040,R1,windturbine,2035,0.75000000000 +10,2045,R1,windturbine,2035,0.75000000000 +10,2049,R1,windturbine,2035,0.75000000000 +10,2050,R1,windturbine,2035,0.75000000000 +10,2054,R1,windturbine,2035,0.75000000000 +10,2055,R1,windturbine,2035,0.75000000000 +10,2059,R1,windturbine,2035,0.75000000000 +10,2060,R1,windturbine,2035,0.75000000000 +10,2064,R1,windturbine,2035,0.75000000000 +11,2045,R1,windturbine,2040,0.70830000000 +11,2049,R1,windturbine,2040,0.70830000000 +11,2050,R1,windturbine,2040,0.70830000000 +11,2054,R1,windturbine,2040,0.70830000000 +11,2055,R1,windturbine,2040,0.70830000000 +11,2059,R1,windturbine,2040,0.70830000000 +11,2060,R1,windturbine,2040,0.70830000000 +11,2064,R1,windturbine,2040,0.70830000000 +11,2065,R1,windturbine,2040,0.70830000000 +11,2069,R1,windturbine,2040,0.70830000000 +12,2055,R1,windturbine,2050,10.00000000000 +12,2059,R1,windturbine,2050,10.00000000000 +12,2060,R1,windturbine,2050,10.00000000000 +12,2064,R1,windturbine,2050,10.00000000000 +12,2065,R1,windturbine,2050,10.00000000000 +12,2069,R1,windturbine,2050,10.00000000000 +12,2070,R1,windturbine,2050,10.00000000000 +12,2074,R1,windturbine,2050,10.00000000000 +12,2075,R1,windturbine,2050,10.00000000000 +12,2079,R1,windturbine,2050,10.00000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv index c58d0c1f6..6c7acc17e 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv @@ -1,8 +1,8 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,14.50000000000 -0,2030,R1,gasboiler,2020,9.50000000000 -0,2034,R1,gasboiler,2020,9.50000000000 -1,2025,R1,heatpump,2020,9.50000000000 -1,2030,R1,heatpump,2020,9.50000000000 -1,2034,R1,heatpump,2020,9.50000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2025,R1,heatpump,2020,11.50000000000 +1,2030,R1,heatpump,2020,11.50000000000 +1,2034,R1,heatpump,2020,11.50000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv index 4e3d88714..6344a1dc2 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv @@ -1,12 +1,16 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,14.50000000000 -0,2030,R1,gasboiler,2020,9.50000000000 -0,2034,R1,gasboiler,2020,9.50000000000 -1,2025,R1,heatpump,2020,9.50000000000 -1,2030,R1,heatpump,2020,9.50000000000 -1,2034,R1,heatpump,2020,9.50000000000 -2,2030,R1,heatpump,2025,11.00000000000 -2,2034,R1,heatpump,2025,11.00000000000 -2,2035,R1,heatpump,2025,11.00000000000 -2,2039,R1,heatpump,2025,11.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,3.50000000000 +1,2034,R1,gasboiler,2025,3.50000000000 +1,2035,R1,gasboiler,2025,3.50000000000 +1,2039,R1,gasboiler,2025,3.50000000000 +2,2025,R1,heatpump,2020,11.50000000000 +2,2030,R1,heatpump,2020,11.50000000000 +2,2034,R1,heatpump,2020,11.50000000000 +3,2030,R1,heatpump,2025,7.50000000000 +3,2034,R1,heatpump,2025,7.50000000000 +3,2035,R1,heatpump,2025,7.50000000000 +3,2039,R1,heatpump,2025,7.50000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv index c385d1415..4635a1f75 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv @@ -1,20 +1,24 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,14.50000000000 -0,2030,R1,gasboiler,2020,9.50000000000 -0,2034,R1,gasboiler,2020,9.50000000000 -1,2035,R1,gasboiler,2030,11.40000000000 -1,2039,R1,gasboiler,2030,11.40000000000 -1,2040,R1,gasboiler,2030,11.40000000000 -1,2044,R1,gasboiler,2030,11.40000000000 -2,2025,R1,heatpump,2020,9.50000000000 -2,2030,R1,heatpump,2020,9.50000000000 -2,2034,R1,heatpump,2020,9.50000000000 -3,2030,R1,heatpump,2025,11.00000000000 -3,2034,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2025,11.00000000000 -3,2039,R1,heatpump,2025,11.00000000000 -4,2035,R1,heatpump,2030,13.60000000000 -4,2039,R1,heatpump,2030,13.60000000000 -4,2040,R1,heatpump,2030,13.60000000000 -4,2044,R1,heatpump,2030,13.60000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,3.50000000000 +1,2034,R1,gasboiler,2025,3.50000000000 +1,2035,R1,gasboiler,2025,3.50000000000 +1,2039,R1,gasboiler,2025,3.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2025,R1,heatpump,2020,11.50000000000 +3,2030,R1,heatpump,2020,11.50000000000 +3,2034,R1,heatpump,2020,11.50000000000 +4,2030,R1,heatpump,2025,7.50000000000 +4,2034,R1,heatpump,2025,7.50000000000 +4,2035,R1,heatpump,2025,7.50000000000 +4,2039,R1,heatpump,2025,7.50000000000 +5,2035,R1,heatpump,2030,12.50000000000 +5,2039,R1,heatpump,2030,12.50000000000 +5,2040,R1,heatpump,2030,12.50000000000 +5,2044,R1,heatpump,2030,12.50000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv index 499e6e12b..a6ec6231f 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv @@ -1,24 +1,32 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,14.50000000000 -0,2030,R1,gasboiler,2020,9.50000000000 -0,2034,R1,gasboiler,2020,9.50000000000 -1,2035,R1,gasboiler,2030,11.40000000000 -1,2039,R1,gasboiler,2030,11.40000000000 -1,2040,R1,gasboiler,2030,11.40000000000 -1,2044,R1,gasboiler,2030,11.40000000000 -2,2025,R1,heatpump,2020,9.50000000000 -2,2030,R1,heatpump,2020,9.50000000000 -2,2034,R1,heatpump,2020,9.50000000000 -3,2030,R1,heatpump,2025,11.00000000000 -3,2034,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2025,11.00000000000 -3,2039,R1,heatpump,2025,11.00000000000 -4,2035,R1,heatpump,2030,13.60000000000 -4,2039,R1,heatpump,2030,13.60000000000 -4,2040,R1,heatpump,2030,13.60000000000 -4,2044,R1,heatpump,2030,13.60000000000 -5,2040,R1,heatpump,2035,17.00000000000 -5,2044,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2035,17.00000000000 -5,2049,R1,heatpump,2035,17.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,3.50000000000 +1,2034,R1,gasboiler,2025,3.50000000000 +1,2035,R1,gasboiler,2025,3.50000000000 +1,2039,R1,gasboiler,2025,3.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2040,R1,gasboiler,2035,4.50000000000 +3,2044,R1,gasboiler,2035,4.50000000000 +3,2045,R1,gasboiler,2035,4.50000000000 +3,2049,R1,gasboiler,2035,4.50000000000 +4,2025,R1,heatpump,2020,11.50000000000 +4,2030,R1,heatpump,2020,11.50000000000 +4,2034,R1,heatpump,2020,11.50000000000 +5,2030,R1,heatpump,2025,7.50000000000 +5,2034,R1,heatpump,2025,7.50000000000 +5,2035,R1,heatpump,2025,7.50000000000 +5,2039,R1,heatpump,2025,7.50000000000 +6,2035,R1,heatpump,2030,12.50000000000 +6,2039,R1,heatpump,2030,12.50000000000 +6,2040,R1,heatpump,2030,12.50000000000 +6,2044,R1,heatpump,2030,12.50000000000 +7,2040,R1,heatpump,2035,12.50000000000 +7,2044,R1,heatpump,2035,12.50000000000 +7,2045,R1,heatpump,2035,12.50000000000 +7,2049,R1,heatpump,2035,12.50000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv index 94a395137..ebc8c8b55 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv @@ -1,28 +1,40 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,14.50000000000 -0,2030,R1,gasboiler,2020,9.50000000000 -0,2034,R1,gasboiler,2020,9.50000000000 -1,2035,R1,gasboiler,2030,11.40000000000 -1,2039,R1,gasboiler,2030,11.40000000000 -1,2040,R1,gasboiler,2030,11.40000000000 -1,2044,R1,gasboiler,2030,11.40000000000 -2,2025,R1,heatpump,2020,9.50000000000 -2,2030,R1,heatpump,2020,9.50000000000 -2,2034,R1,heatpump,2020,9.50000000000 -3,2030,R1,heatpump,2025,11.00000000000 -3,2034,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2025,11.00000000000 -3,2039,R1,heatpump,2025,11.00000000000 -4,2035,R1,heatpump,2030,13.60000000000 -4,2039,R1,heatpump,2030,13.60000000000 -4,2040,R1,heatpump,2030,13.60000000000 -4,2044,R1,heatpump,2030,13.60000000000 -5,2040,R1,heatpump,2035,17.00000000000 -5,2044,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2035,17.00000000000 -5,2049,R1,heatpump,2035,17.00000000000 -6,2045,R1,heatpump,2040,31.00000000000 -6,2049,R1,heatpump,2040,31.00000000000 -6,2050,R1,heatpump,2040,31.00000000000 -6,2054,R1,heatpump,2040,31.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,3.50000000000 +1,2034,R1,gasboiler,2025,3.50000000000 +1,2035,R1,gasboiler,2025,3.50000000000 +1,2039,R1,gasboiler,2025,3.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2040,R1,gasboiler,2035,4.50000000000 +3,2044,R1,gasboiler,2035,4.50000000000 +3,2045,R1,gasboiler,2035,4.50000000000 +3,2049,R1,gasboiler,2035,4.50000000000 +4,2045,R1,gasboiler,2040,11.50000000000 +4,2049,R1,gasboiler,2040,11.50000000000 +4,2050,R1,gasboiler,2040,11.50000000000 +4,2054,R1,gasboiler,2040,11.50000000000 +5,2025,R1,heatpump,2020,11.50000000000 +5,2030,R1,heatpump,2020,11.50000000000 +5,2034,R1,heatpump,2020,11.50000000000 +6,2030,R1,heatpump,2025,7.50000000000 +6,2034,R1,heatpump,2025,7.50000000000 +6,2035,R1,heatpump,2025,7.50000000000 +6,2039,R1,heatpump,2025,7.50000000000 +7,2035,R1,heatpump,2030,12.50000000000 +7,2039,R1,heatpump,2030,12.50000000000 +7,2040,R1,heatpump,2030,12.50000000000 +7,2044,R1,heatpump,2030,12.50000000000 +8,2040,R1,heatpump,2035,12.50000000000 +8,2044,R1,heatpump,2035,12.50000000000 +8,2045,R1,heatpump,2035,12.50000000000 +8,2049,R1,heatpump,2035,12.50000000000 +9,2045,R1,heatpump,2040,19.50000000000 +9,2049,R1,heatpump,2040,19.50000000000 +9,2050,R1,heatpump,2040,19.50000000000 +9,2054,R1,heatpump,2040,19.50000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv index 5367158a8..82601e4d7 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv @@ -1,32 +1,44 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,14.50000000000 -0,2030,R1,gasboiler,2020,9.50000000000 -0,2034,R1,gasboiler,2020,9.50000000000 -1,2035,R1,gasboiler,2030,11.40000000000 -1,2039,R1,gasboiler,2030,11.40000000000 -1,2040,R1,gasboiler,2030,11.40000000000 -1,2044,R1,gasboiler,2030,11.40000000000 -2,2025,R1,heatpump,2020,9.50000000000 -2,2030,R1,heatpump,2020,9.50000000000 -2,2034,R1,heatpump,2020,9.50000000000 -3,2030,R1,heatpump,2025,11.00000000000 -3,2034,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2025,11.00000000000 -3,2039,R1,heatpump,2025,11.00000000000 -4,2035,R1,heatpump,2030,13.60000000000 -4,2039,R1,heatpump,2030,13.60000000000 -4,2040,R1,heatpump,2030,13.60000000000 -4,2044,R1,heatpump,2030,13.60000000000 -5,2040,R1,heatpump,2035,17.00000000000 -5,2044,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2035,17.00000000000 -5,2049,R1,heatpump,2035,17.00000000000 -6,2045,R1,heatpump,2040,31.00000000000 -6,2049,R1,heatpump,2040,31.00000000000 -6,2050,R1,heatpump,2040,31.00000000000 -6,2054,R1,heatpump,2040,31.00000000000 -7,2050,R1,heatpump,2045,23.00000000000 -7,2054,R1,heatpump,2045,23.00000000000 -7,2055,R1,heatpump,2045,23.00000000000 -7,2059,R1,heatpump,2045,23.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,3.50000000000 +1,2034,R1,gasboiler,2025,3.50000000000 +1,2035,R1,gasboiler,2025,3.50000000000 +1,2039,R1,gasboiler,2025,3.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2040,R1,gasboiler,2035,4.50000000000 +3,2044,R1,gasboiler,2035,4.50000000000 +3,2045,R1,gasboiler,2035,4.50000000000 +3,2049,R1,gasboiler,2035,4.50000000000 +4,2045,R1,gasboiler,2040,11.50000000000 +4,2049,R1,gasboiler,2040,11.50000000000 +4,2050,R1,gasboiler,2040,11.50000000000 +4,2054,R1,gasboiler,2040,11.50000000000 +5,2025,R1,heatpump,2020,11.50000000000 +5,2030,R1,heatpump,2020,11.50000000000 +5,2034,R1,heatpump,2020,11.50000000000 +6,2030,R1,heatpump,2025,7.50000000000 +6,2034,R1,heatpump,2025,7.50000000000 +6,2035,R1,heatpump,2025,7.50000000000 +6,2039,R1,heatpump,2025,7.50000000000 +7,2035,R1,heatpump,2030,12.50000000000 +7,2039,R1,heatpump,2030,12.50000000000 +7,2040,R1,heatpump,2030,12.50000000000 +7,2044,R1,heatpump,2030,12.50000000000 +8,2040,R1,heatpump,2035,12.50000000000 +8,2044,R1,heatpump,2035,12.50000000000 +8,2045,R1,heatpump,2035,12.50000000000 +8,2049,R1,heatpump,2035,12.50000000000 +9,2045,R1,heatpump,2040,19.50000000000 +9,2049,R1,heatpump,2040,19.50000000000 +9,2050,R1,heatpump,2040,19.50000000000 +9,2054,R1,heatpump,2040,19.50000000000 +10,2050,R1,heatpump,2045,23.00000000000 +10,2054,R1,heatpump,2045,23.00000000000 +10,2055,R1,heatpump,2045,23.00000000000 +10,2059,R1,heatpump,2045,23.00000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv index 3d5b42b26..49fe9db08 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv @@ -1,36 +1,48 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gasboiler,2020,10.00000000000 -0,2025,R1,gasboiler,2020,14.50000000000 -0,2030,R1,gasboiler,2020,9.50000000000 -0,2034,R1,gasboiler,2020,9.50000000000 -1,2035,R1,gasboiler,2030,11.40000000000 -1,2039,R1,gasboiler,2030,11.40000000000 -1,2040,R1,gasboiler,2030,11.40000000000 -1,2044,R1,gasboiler,2030,11.40000000000 -2,2025,R1,heatpump,2020,9.50000000000 -2,2030,R1,heatpump,2020,9.50000000000 -2,2034,R1,heatpump,2020,9.50000000000 -3,2030,R1,heatpump,2025,11.00000000000 -3,2034,R1,heatpump,2025,11.00000000000 -3,2035,R1,heatpump,2025,11.00000000000 -3,2039,R1,heatpump,2025,11.00000000000 -4,2035,R1,heatpump,2030,13.60000000000 -4,2039,R1,heatpump,2030,13.60000000000 -4,2040,R1,heatpump,2030,13.60000000000 -4,2044,R1,heatpump,2030,13.60000000000 -5,2040,R1,heatpump,2035,17.00000000000 -5,2044,R1,heatpump,2035,17.00000000000 -5,2045,R1,heatpump,2035,17.00000000000 -5,2049,R1,heatpump,2035,17.00000000000 -6,2045,R1,heatpump,2040,31.00000000000 -6,2049,R1,heatpump,2040,31.00000000000 -6,2050,R1,heatpump,2040,31.00000000000 -6,2054,R1,heatpump,2040,31.00000000000 -7,2050,R1,heatpump,2045,23.00000000000 -7,2054,R1,heatpump,2045,23.00000000000 -7,2055,R1,heatpump,2045,23.00000000000 -7,2059,R1,heatpump,2045,23.00000000000 -8,2055,R1,heatpump,2050,31.00000000000 -8,2059,R1,heatpump,2050,31.00000000000 -8,2060,R1,heatpump,2050,31.00000000000 -8,2064,R1,heatpump,2050,31.00000000000 +0,2025,R1,gasboiler,2020,12.50000000000 +0,2030,R1,gasboiler,2020,7.50000000000 +0,2034,R1,gasboiler,2020,7.50000000000 +1,2030,R1,gasboiler,2025,3.50000000000 +1,2034,R1,gasboiler,2025,3.50000000000 +1,2035,R1,gasboiler,2025,3.50000000000 +1,2039,R1,gasboiler,2025,3.50000000000 +2,2035,R1,gasboiler,2030,12.50000000000 +2,2039,R1,gasboiler,2030,12.50000000000 +2,2040,R1,gasboiler,2030,12.50000000000 +2,2044,R1,gasboiler,2030,12.50000000000 +3,2040,R1,gasboiler,2035,4.50000000000 +3,2044,R1,gasboiler,2035,4.50000000000 +3,2045,R1,gasboiler,2035,4.50000000000 +3,2049,R1,gasboiler,2035,4.50000000000 +4,2045,R1,gasboiler,2040,11.50000000000 +4,2049,R1,gasboiler,2040,11.50000000000 +4,2050,R1,gasboiler,2040,11.50000000000 +4,2054,R1,gasboiler,2040,11.50000000000 +5,2025,R1,heatpump,2020,11.50000000000 +5,2030,R1,heatpump,2020,11.50000000000 +5,2034,R1,heatpump,2020,11.50000000000 +6,2030,R1,heatpump,2025,7.50000000000 +6,2034,R1,heatpump,2025,7.50000000000 +6,2035,R1,heatpump,2025,7.50000000000 +6,2039,R1,heatpump,2025,7.50000000000 +7,2035,R1,heatpump,2030,12.50000000000 +7,2039,R1,heatpump,2030,12.50000000000 +7,2040,R1,heatpump,2030,12.50000000000 +7,2044,R1,heatpump,2030,12.50000000000 +8,2040,R1,heatpump,2035,12.50000000000 +8,2044,R1,heatpump,2035,12.50000000000 +8,2045,R1,heatpump,2035,12.50000000000 +8,2049,R1,heatpump,2035,12.50000000000 +9,2045,R1,heatpump,2040,19.50000000000 +9,2049,R1,heatpump,2040,19.50000000000 +9,2050,R1,heatpump,2040,19.50000000000 +9,2054,R1,heatpump,2040,19.50000000000 +10,2050,R1,heatpump,2045,23.00000000000 +10,2054,R1,heatpump,2045,23.00000000000 +10,2055,R1,heatpump,2045,23.00000000000 +10,2059,R1,heatpump,2045,23.00000000000 +11,2055,R1,heatpump,2050,31.00000000000 +11,2059,R1,heatpump,2050,31.00000000000 +11,2060,R1,heatpump,2050,31.00000000000 +11,2064,R1,heatpump,2050,31.00000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv index 0a3c16bc3..cdc2e5a40 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv @@ -1,31 +1,31 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply 0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000 -0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.80560000000 -0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.52780000000 +0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.69440000000 +0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.63890000000 0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000 -0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,52.12750000000 +0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,44.93750000000 1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000 -1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.20830000000 -1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.79170000000 +1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.04170000000 +1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.95830000000 1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000 -1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,78.19120000000 +1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,67.40620000000 2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000 -2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.80560000000 -2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.52780000000 +2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.69440000000 +2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000 2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000 -2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,52.12750000000 +2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,44.93750000000 3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000 -3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.20830000000 -3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.79170000000 +3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.04170000000 +3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000 3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000 -3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,78.19120000000 +3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,67.40620000000 4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000 -4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.41670000000 -4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.58330000000 +4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.08330000000 +4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000 4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000 -4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,156.38250000000 +4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,134.81250000000 5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000 -5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.61110000000 -5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.05560000000 +5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.38890000000 +5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.27780000000 5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000 -5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,104.25500000000 +5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,89.87500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv index 6c362d1a3..8ef451c83 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv @@ -1,43 +1,55 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.80560000000 -0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.52780000000 -0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.52780000000 -0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.52780000000 -0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,52.12750000000 -0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,34.15250000000 -1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.20830000000 -1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.79170000000 -1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.79170000000 -1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.79170000000 -1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,78.19120000000 -1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,51.22880000000 -2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.80560000000 -2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.52780000000 -2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.52780000000 -2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.52780000000 -2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,52.12750000000 -2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,34.15250000000 -3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.20830000000 -3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.79170000000 -3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.79170000000 -3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.79170000000 -3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,78.19120000000 -3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,51.22880000000 -4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.41670000000 -4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.58330000000 -4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.58330000000 -4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.58330000000 -4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,156.38250000000 -4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,102.45750000000 -5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.61110000000 -5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.05560000000 -5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,1.05560000000 -5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.05560000000 -5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,104.25500000000 -5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,68.30500000000 +0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.69440000000 +0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,0.63890000000 +0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.41670000000 +0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.19440000000 +0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,0.63890000000 +0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.41670000000 +0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,44.93750000000 +0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,26.96250000000 +0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,12.58250000000 +1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,1.04170000000 +1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,0.95830000000 +1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.62500000000 +1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.29170000000 +1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,0.95830000000 +1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.62500000000 +1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,67.40620000000 +1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,40.44370000000 +1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,18.87370000000 +2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.69440000000 +2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000 +2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.41670000000 +2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.19440000000 +2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000 +2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.41670000000 +2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,44.93750000000 +2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,26.96250000000 +2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,12.58250000000 +3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.04170000000 +3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000 +3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.62500000000 +3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.29170000000 +3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000 +3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.62500000000 +3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,67.40620000000 +3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,40.44370000000 +3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,18.87370000000 +4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.08330000000 +4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000 +4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.25000000000 +4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.58330000000 +4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000 +4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.25000000000 +4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,134.81250000000 +4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,80.88750000000 +4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,37.74750000000 +5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,1.38890000000 +5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,1.27780000000 +5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,0.83330000000 +5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.38890000000 +5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,1.27780000000 +5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.83330000000 +5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,89.87500000000 +5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,53.92500000000 +5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,25.16500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv index b6e35b7ca..aeea8ae59 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv @@ -1,49 +1,73 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.52780000000 -0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,0.52780000000 -0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2030,0.63330000000 -0,heat,2035,3,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,heat,2035,4,R1,all-year,all-week,night,heatpump,2030,0.75560000000 -0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,34.15250000000 -0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2030,40.98300000000 -1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.79170000000 -1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,0.79170000000 -1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2030,0.95000000000 -1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,heat,2035,4,R1,all-year,all-week,morning,heatpump,2030,1.13330000000 -1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,51.22880000000 -1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2030,61.47450000000 -2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.52780000000 -2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,0.52780000000 -2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2030,0.63330000000 -2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,heat,2035,4,R1,all-year,all-week,afternoon,heatpump,2030,0.75560000000 -2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,34.15250000000 -2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2030,40.98300000000 -3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.79170000000 -3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,0.79170000000 -3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2030,0.95000000000 -3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,heat,2035,4,R1,all-year,all-week,early-peak,heatpump,2030,1.13330000000 -3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,51.22880000000 -3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2030,61.47450000000 -4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.58330000000 -4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,1.58330000000 -4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2030,1.90000000000 -4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,heat,2035,4,R1,all-year,all-week,late-peak,heatpump,2030,2.26670000000 -4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,102.45750000000 -4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2030,122.94900000000 -5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,1.05560000000 -5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,1.05560000000 -5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2030,1.26670000000 -5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,heat,2035,4,R1,all-year,all-week,evening,heatpump,2030,1.51110000000 -5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,68.30500000000 -5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2030,81.96600000000 +0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2020,0.41670000000 +0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.19440000000 +0,heat,2030,3,R1,all-year,all-week,night,heatpump,2020,0.63890000000 +0,heat,2030,4,R1,all-year,all-week,night,heatpump,2025,0.41670000000 +0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.19440000000 +0,heat,2035,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000 +0,heat,2035,4,R1,all-year,all-week,night,heatpump,2025,0.41670000000 +0,heat,2035,5,R1,all-year,all-week,night,heatpump,2030,0.69440000000 +0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2020,26.96250000000 +0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,12.58250000000 +0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,12.58250000000 +0,CO2f,2035,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000 +1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2020,0.62500000000 +1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.29170000000 +1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2020,0.95830000000 +1,heat,2030,4,R1,all-year,all-week,morning,heatpump,2025,0.62500000000 +1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.29170000000 +1,heat,2035,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000 +1,heat,2035,4,R1,all-year,all-week,morning,heatpump,2025,0.62500000000 +1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2030,1.04170000000 +1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2020,40.44370000000 +1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,18.87370000000 +1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,18.87370000000 +1,CO2f,2035,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000 +2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.41670000000 +2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.19440000000 +2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2020,0.63890000000 +2,heat,2030,4,R1,all-year,all-week,afternoon,heatpump,2025,0.41670000000 +2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.19440000000 +2,heat,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000 +2,heat,2035,4,R1,all-year,all-week,afternoon,heatpump,2025,0.41670000000 +2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000 +2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2020,26.96250000000 +2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,12.58250000000 +2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,12.58250000000 +2,CO2f,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000 +3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.62500000000 +3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.29170000000 +3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2020,0.95830000000 +3,heat,2030,4,R1,all-year,all-week,early-peak,heatpump,2025,0.62500000000 +3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.29170000000 +3,heat,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000 +3,heat,2035,4,R1,all-year,all-week,early-peak,heatpump,2025,0.62500000000 +3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000 +3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2020,40.44370000000 +3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,18.87370000000 +3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,18.87370000000 +3,CO2f,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000 +4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.25000000000 +4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.58330000000 +4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2020,1.91670000000 +4,heat,2030,4,R1,all-year,all-week,late-peak,heatpump,2025,1.25000000000 +4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.58330000000 +4,heat,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000 +4,heat,2035,4,R1,all-year,all-week,late-peak,heatpump,2025,1.25000000000 +4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000 +4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2020,80.88750000000 +4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,37.74750000000 +4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,37.74750000000 +4,CO2f,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000 +5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2020,0.83330000000 +5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.38890000000 +5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2020,1.27780000000 +5,heat,2030,4,R1,all-year,all-week,evening,heatpump,2025,0.83330000000 +5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.38890000000 +5,heat,2035,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000 +5,heat,2035,4,R1,all-year,all-week,evening,heatpump,2025,0.83330000000 +5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2030,1.38890000000 +5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2020,53.92500000000 +5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,25.16500000000 +5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,25.16500000000 +5,CO2f,2035,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv index 1587b7cce..40bc2d929 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv @@ -1,49 +1,73 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2030,0.63330000000 -0,heat,2035,3,R1,all-year,all-week,night,heatpump,2025,0.61110000000 -0,heat,2035,4,R1,all-year,all-week,night,heatpump,2030,0.75560000000 -0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2030,0.63330000000 -0,heat,2040,4,R1,all-year,all-week,night,heatpump,2030,0.75560000000 -0,heat,2040,5,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2030,40.98300000000 -0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2030,40.98300000000 -1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2030,0.95000000000 -1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2025,0.91670000000 -1,heat,2035,4,R1,all-year,all-week,morning,heatpump,2030,1.13330000000 -1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2030,0.95000000000 -1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2030,1.13330000000 -1,heat,2040,5,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2030,61.47450000000 -1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2030,61.47450000000 -2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2030,0.63330000000 -2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000 -2,heat,2035,4,R1,all-year,all-week,afternoon,heatpump,2030,0.75560000000 -2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2030,0.63330000000 -2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2030,0.75560000000 -2,heat,2040,5,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2030,40.98300000000 -2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2030,40.98300000000 -3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2030,0.95000000000 -3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000 -3,heat,2035,4,R1,all-year,all-week,early-peak,heatpump,2030,1.13330000000 -3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2030,0.95000000000 -3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2030,1.13330000000 -3,heat,2040,5,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2030,61.47450000000 -3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2030,61.47450000000 -4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2030,1.90000000000 -4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000 -4,heat,2035,4,R1,all-year,all-week,late-peak,heatpump,2030,2.26670000000 -4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2030,1.90000000000 -4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2030,2.26670000000 -4,heat,2040,5,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2030,122.94900000000 -4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2030,122.94900000000 -5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2030,1.26670000000 -5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2025,1.22220000000 -5,heat,2035,4,R1,all-year,all-week,evening,heatpump,2030,1.51110000000 -5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2030,1.26670000000 -5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2030,1.51110000000 -5,heat,2040,5,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2030,81.96600000000 -5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2030,81.96600000000 +0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.19440000000 +0,heat,2035,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000 +0,heat,2035,5,R1,all-year,all-week,night,heatpump,2025,0.41670000000 +0,heat,2035,6,R1,all-year,all-week,night,heatpump,2030,0.69440000000 +0,heat,2040,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000 +0,heat,2040,3,R1,all-year,all-week,night,gasboiler,2035,0.25000000000 +0,heat,2040,6,R1,all-year,all-week,night,heatpump,2030,0.69440000000 +0,heat,2040,7,R1,all-year,all-week,night,heatpump,2035,0.69440000000 +0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,12.58250000000 +0,CO2f,2035,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000 +0,CO2f,2040,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000 +0,CO2f,2040,3,R1,all-year,all-week,night,gasboiler,2035,16.17750000000 +1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.29170000000 +1,heat,2035,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000 +1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2025,0.62500000000 +1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2030,1.04170000000 +1,heat,2040,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000 +1,heat,2040,3,R1,all-year,all-week,morning,gasboiler,2035,0.37500000000 +1,heat,2040,6,R1,all-year,all-week,morning,heatpump,2030,1.04170000000 +1,heat,2040,7,R1,all-year,all-week,morning,heatpump,2035,1.04170000000 +1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,18.87370000000 +1,CO2f,2035,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000 +1,CO2f,2040,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000 +1,CO2f,2040,3,R1,all-year,all-week,morning,gasboiler,2035,24.26620000000 +2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.19440000000 +2,heat,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000 +2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2025,0.41670000000 +2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000 +2,heat,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000 +2,heat,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.25000000000 +2,heat,2040,6,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000 +2,heat,2040,7,R1,all-year,all-week,afternoon,heatpump,2035,0.69440000000 +2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,12.58250000000 +2,CO2f,2035,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000 +2,CO2f,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000 +2,CO2f,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,16.17750000000 +3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.29170000000 +3,heat,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000 +3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2025,0.62500000000 +3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000 +3,heat,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000 +3,heat,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.37500000000 +3,heat,2040,6,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000 +3,heat,2040,7,R1,all-year,all-week,early-peak,heatpump,2035,1.04170000000 +3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,18.87370000000 +3,CO2f,2035,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000 +3,CO2f,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000 +3,CO2f,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,24.26620000000 +4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.58330000000 +4,heat,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000 +4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2025,1.25000000000 +4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000 +4,heat,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000 +4,heat,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,0.75000000000 +4,heat,2040,6,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000 +4,heat,2040,7,R1,all-year,all-week,late-peak,heatpump,2035,2.08330000000 +4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,37.74750000000 +4,CO2f,2035,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000 +4,CO2f,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000 +4,CO2f,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,48.53250000000 +5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.38890000000 +5,heat,2035,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000 +5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2025,0.83330000000 +5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2030,1.38890000000 +5,heat,2040,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000 +5,heat,2040,3,R1,all-year,all-week,evening,gasboiler,2035,0.50000000000 +5,heat,2040,6,R1,all-year,all-week,evening,heatpump,2030,1.38890000000 +5,heat,2040,7,R1,all-year,all-week,evening,heatpump,2035,1.38890000000 +5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,25.16500000000 +5,CO2f,2035,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000 +5,CO2f,2040,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000 +5,CO2f,2040,3,R1,all-year,all-week,evening,gasboiler,2035,32.35500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv index c3f4f2153..0f091fe39 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv @@ -1,37 +1,73 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2030,0.63330000000 -0,heat,2040,4,R1,all-year,all-week,night,heatpump,2030,0.75560000000 -0,heat,2040,5,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,heat,2045,5,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,heat,2045,6,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2030,40.98300000000 -1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2030,0.95000000000 -1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2030,1.13330000000 -1,heat,2040,5,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,heat,2045,6,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2030,61.47450000000 -2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2030,0.63330000000 -2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2030,0.75560000000 -2,heat,2040,5,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,heat,2045,6,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2030,40.98300000000 -3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2030,0.95000000000 -3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2030,1.13330000000 -3,heat,2040,5,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,heat,2045,6,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2030,61.47450000000 -4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2030,1.90000000000 -4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2030,2.26670000000 -4,heat,2040,5,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,heat,2045,6,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2030,122.94900000000 -5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2030,1.26670000000 -5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2030,1.51110000000 -5,heat,2040,5,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,heat,2045,6,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2030,81.96600000000 +0,heat,2040,2,R1,all-year,all-week,night,gasboiler,2030,0.69440000000 +0,heat,2040,3,R1,all-year,all-week,night,gasboiler,2035,0.25000000000 +0,heat,2040,7,R1,all-year,all-week,night,heatpump,2030,0.69440000000 +0,heat,2040,8,R1,all-year,all-week,night,heatpump,2035,0.69440000000 +0,heat,2045,3,R1,all-year,all-week,night,gasboiler,2035,0.25000000000 +0,heat,2045,4,R1,all-year,all-week,night,gasboiler,2040,0.63890000000 +0,heat,2045,8,R1,all-year,all-week,night,heatpump,2035,0.69440000000 +0,heat,2045,9,R1,all-year,all-week,night,heatpump,2040,1.08330000000 +0,CO2f,2040,2,R1,all-year,all-week,night,gasboiler,2030,44.93750000000 +0,CO2f,2040,3,R1,all-year,all-week,night,gasboiler,2035,16.17750000000 +0,CO2f,2045,3,R1,all-year,all-week,night,gasboiler,2035,16.17750000000 +0,CO2f,2045,4,R1,all-year,all-week,night,gasboiler,2040,41.34250000000 +1,heat,2040,2,R1,all-year,all-week,morning,gasboiler,2030,1.04170000000 +1,heat,2040,3,R1,all-year,all-week,morning,gasboiler,2035,0.37500000000 +1,heat,2040,7,R1,all-year,all-week,morning,heatpump,2030,1.04170000000 +1,heat,2040,8,R1,all-year,all-week,morning,heatpump,2035,1.04170000000 +1,heat,2045,3,R1,all-year,all-week,morning,gasboiler,2035,0.37500000000 +1,heat,2045,4,R1,all-year,all-week,morning,gasboiler,2040,0.95830000000 +1,heat,2045,8,R1,all-year,all-week,morning,heatpump,2035,1.04170000000 +1,heat,2045,9,R1,all-year,all-week,morning,heatpump,2040,1.62500000000 +1,CO2f,2040,2,R1,all-year,all-week,morning,gasboiler,2030,67.40630000000 +1,CO2f,2040,3,R1,all-year,all-week,morning,gasboiler,2035,24.26620000000 +1,CO2f,2045,3,R1,all-year,all-week,morning,gasboiler,2035,24.26620000000 +1,CO2f,2045,4,R1,all-year,all-week,morning,gasboiler,2040,62.01380000000 +2,heat,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,0.69440000000 +2,heat,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.25000000000 +2,heat,2040,7,R1,all-year,all-week,afternoon,heatpump,2030,0.69440000000 +2,heat,2040,8,R1,all-year,all-week,afternoon,heatpump,2035,0.69440000000 +2,heat,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.25000000000 +2,heat,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.63890000000 +2,heat,2045,8,R1,all-year,all-week,afternoon,heatpump,2035,0.69440000000 +2,heat,2045,9,R1,all-year,all-week,afternoon,heatpump,2040,1.08330000000 +2,CO2f,2040,2,R1,all-year,all-week,afternoon,gasboiler,2030,44.93750000000 +2,CO2f,2040,3,R1,all-year,all-week,afternoon,gasboiler,2035,16.17750000000 +2,CO2f,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,16.17750000000 +2,CO2f,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,41.34250000000 +3,heat,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,1.04170000000 +3,heat,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.37500000000 +3,heat,2040,7,R1,all-year,all-week,early-peak,heatpump,2030,1.04170000000 +3,heat,2040,8,R1,all-year,all-week,early-peak,heatpump,2035,1.04170000000 +3,heat,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.37500000000 +3,heat,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,0.95830000000 +3,heat,2045,8,R1,all-year,all-week,early-peak,heatpump,2035,1.04170000000 +3,heat,2045,9,R1,all-year,all-week,early-peak,heatpump,2040,1.62500000000 +3,CO2f,2040,2,R1,all-year,all-week,early-peak,gasboiler,2030,67.40630000000 +3,CO2f,2040,3,R1,all-year,all-week,early-peak,gasboiler,2035,24.26620000000 +3,CO2f,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,24.26620000000 +3,CO2f,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,62.01380000000 +4,heat,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,2.08330000000 +4,heat,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,0.75000000000 +4,heat,2040,7,R1,all-year,all-week,late-peak,heatpump,2030,2.08330000000 +4,heat,2040,8,R1,all-year,all-week,late-peak,heatpump,2035,2.08330000000 +4,heat,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,0.75000000000 +4,heat,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,1.91670000000 +4,heat,2045,8,R1,all-year,all-week,late-peak,heatpump,2035,2.08330000000 +4,heat,2045,9,R1,all-year,all-week,late-peak,heatpump,2040,3.25000000000 +4,CO2f,2040,2,R1,all-year,all-week,late-peak,gasboiler,2030,134.81250000000 +4,CO2f,2040,3,R1,all-year,all-week,late-peak,gasboiler,2035,48.53250000000 +4,CO2f,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,48.53250000000 +4,CO2f,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,124.02750000000 +5,heat,2040,2,R1,all-year,all-week,evening,gasboiler,2030,1.38890000000 +5,heat,2040,3,R1,all-year,all-week,evening,gasboiler,2035,0.50000000000 +5,heat,2040,7,R1,all-year,all-week,evening,heatpump,2030,1.38890000000 +5,heat,2040,8,R1,all-year,all-week,evening,heatpump,2035,1.38890000000 +5,heat,2045,3,R1,all-year,all-week,evening,gasboiler,2035,0.50000000000 +5,heat,2045,4,R1,all-year,all-week,evening,gasboiler,2040,1.27780000000 +5,heat,2045,8,R1,all-year,all-week,evening,heatpump,2035,1.38890000000 +5,heat,2045,9,R1,all-year,all-week,evening,heatpump,2040,2.16670000000 +5,CO2f,2040,2,R1,all-year,all-week,evening,gasboiler,2030,89.87500000000 +5,CO2f,2040,3,R1,all-year,all-week,evening,gasboiler,2035,32.35500000000 +5,CO2f,2045,3,R1,all-year,all-week,evening,gasboiler,2035,32.35500000000 +5,CO2f,2045,4,R1,all-year,all-week,evening,gasboiler,2040,82.68500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv index 535edc7ae..3846e0af7 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv @@ -1,25 +1,61 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2045,5,R1,all-year,all-week,night,heatpump,2035,0.94440000000 -0,heat,2045,6,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,heat,2050,6,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,heat,2050,7,R1,all-year,all-week,night,heatpump,2045,1.27780000000 -1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2035,1.41670000000 -1,heat,2045,6,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,heat,2050,7,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 -2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000 -2,heat,2045,6,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,heat,2050,7,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 -3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000 -3,heat,2045,6,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,heat,2050,7,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 -4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000 -4,heat,2045,6,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,heat,2050,7,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 -5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2035,1.88890000000 -5,heat,2045,6,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,heat,2050,7,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 +0,heat,2045,3,R1,all-year,all-week,night,gasboiler,2035,0.25000000000 +0,heat,2045,4,R1,all-year,all-week,night,gasboiler,2040,0.63890000000 +0,heat,2045,8,R1,all-year,all-week,night,heatpump,2035,0.69440000000 +0,heat,2045,9,R1,all-year,all-week,night,heatpump,2040,1.08330000000 +0,heat,2050,4,R1,all-year,all-week,night,gasboiler,2040,0.63890000000 +0,heat,2050,9,R1,all-year,all-week,night,heatpump,2040,1.08330000000 +0,heat,2050,10,R1,all-year,all-week,night,heatpump,2045,1.27780000000 +0,CO2f,2045,3,R1,all-year,all-week,night,gasboiler,2035,16.17750000000 +0,CO2f,2045,4,R1,all-year,all-week,night,gasboiler,2040,41.34250000000 +0,CO2f,2050,4,R1,all-year,all-week,night,gasboiler,2040,41.34250000000 +1,heat,2045,3,R1,all-year,all-week,morning,gasboiler,2035,0.37500000000 +1,heat,2045,4,R1,all-year,all-week,morning,gasboiler,2040,0.95830000000 +1,heat,2045,8,R1,all-year,all-week,morning,heatpump,2035,1.04170000000 +1,heat,2045,9,R1,all-year,all-week,morning,heatpump,2040,1.62500000000 +1,heat,2050,4,R1,all-year,all-week,morning,gasboiler,2040,0.95830000000 +1,heat,2050,9,R1,all-year,all-week,morning,heatpump,2040,1.62500000000 +1,heat,2050,10,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 +1,CO2f,2045,3,R1,all-year,all-week,morning,gasboiler,2035,24.26620000000 +1,CO2f,2045,4,R1,all-year,all-week,morning,gasboiler,2040,62.01380000000 +1,CO2f,2050,4,R1,all-year,all-week,morning,gasboiler,2040,62.01380000000 +2,heat,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,0.25000000000 +2,heat,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.63890000000 +2,heat,2045,8,R1,all-year,all-week,afternoon,heatpump,2035,0.69440000000 +2,heat,2045,9,R1,all-year,all-week,afternoon,heatpump,2040,1.08330000000 +2,heat,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.63890000000 +2,heat,2050,9,R1,all-year,all-week,afternoon,heatpump,2040,1.08330000000 +2,heat,2050,10,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 +2,CO2f,2045,3,R1,all-year,all-week,afternoon,gasboiler,2035,16.17750000000 +2,CO2f,2045,4,R1,all-year,all-week,afternoon,gasboiler,2040,41.34250000000 +2,CO2f,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,41.34250000000 +3,heat,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,0.37500000000 +3,heat,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,0.95830000000 +3,heat,2045,8,R1,all-year,all-week,early-peak,heatpump,2035,1.04170000000 +3,heat,2045,9,R1,all-year,all-week,early-peak,heatpump,2040,1.62500000000 +3,heat,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,0.95830000000 +3,heat,2050,9,R1,all-year,all-week,early-peak,heatpump,2040,1.62500000000 +3,heat,2050,10,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 +3,CO2f,2045,3,R1,all-year,all-week,early-peak,gasboiler,2035,24.26620000000 +3,CO2f,2045,4,R1,all-year,all-week,early-peak,gasboiler,2040,62.01380000000 +3,CO2f,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,62.01380000000 +4,heat,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,0.75000000000 +4,heat,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,1.91670000000 +4,heat,2045,8,R1,all-year,all-week,late-peak,heatpump,2035,2.08330000000 +4,heat,2045,9,R1,all-year,all-week,late-peak,heatpump,2040,3.25000000000 +4,heat,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,1.91670000000 +4,heat,2050,9,R1,all-year,all-week,late-peak,heatpump,2040,3.25000000000 +4,heat,2050,10,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 +4,CO2f,2045,3,R1,all-year,all-week,late-peak,gasboiler,2035,48.53250000000 +4,CO2f,2045,4,R1,all-year,all-week,late-peak,gasboiler,2040,124.02750000000 +4,CO2f,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,124.02750000000 +5,heat,2045,3,R1,all-year,all-week,evening,gasboiler,2035,0.50000000000 +5,heat,2045,4,R1,all-year,all-week,evening,gasboiler,2040,1.27780000000 +5,heat,2045,8,R1,all-year,all-week,evening,heatpump,2035,1.38890000000 +5,heat,2045,9,R1,all-year,all-week,evening,heatpump,2040,2.16670000000 +5,heat,2050,4,R1,all-year,all-week,evening,gasboiler,2040,1.27780000000 +5,heat,2050,9,R1,all-year,all-week,evening,heatpump,2040,2.16670000000 +5,heat,2050,10,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 +5,CO2f,2045,3,R1,all-year,all-week,evening,gasboiler,2035,32.35500000000 +5,CO2f,2045,4,R1,all-year,all-week,evening,gasboiler,2040,82.68500000000 +5,CO2f,2050,4,R1,all-year,all-week,evening,gasboiler,2040,82.68500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv index 136de0837..4c17f26c7 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv @@ -1,25 +1,37 @@ timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply -0,heat,2050,6,R1,all-year,all-week,night,heatpump,2040,1.72220000000 -0,heat,2050,7,R1,all-year,all-week,night,heatpump,2045,1.27780000000 -0,heat,2055,7,R1,all-year,all-week,night,heatpump,2045,1.27780000000 -0,heat,2055,8,R1,all-year,all-week,night,heatpump,2050,1.72220000000 -1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2040,2.58330000000 -1,heat,2050,7,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 -1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 -1,heat,2055,8,R1,all-year,all-week,morning,heatpump,2050,2.58330000000 -2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000 -2,heat,2050,7,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 -2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 -2,heat,2055,8,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000 -3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000 -3,heat,2050,7,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 -3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 -3,heat,2055,8,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000 -4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000 -4,heat,2050,7,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 -4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 -4,heat,2055,8,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000 -5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2040,3.44440000000 -5,heat,2050,7,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 -5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 -5,heat,2055,8,R1,all-year,all-week,evening,heatpump,2050,3.44440000000 +0,heat,2050,4,R1,all-year,all-week,night,gasboiler,2040,0.63890000000 +0,heat,2050,9,R1,all-year,all-week,night,heatpump,2040,1.08330000000 +0,heat,2050,10,R1,all-year,all-week,night,heatpump,2045,1.27780000000 +0,heat,2055,10,R1,all-year,all-week,night,heatpump,2045,1.27780000000 +0,heat,2055,11,R1,all-year,all-week,night,heatpump,2050,1.72220000000 +0,CO2f,2050,4,R1,all-year,all-week,night,gasboiler,2040,41.34250000000 +1,heat,2050,4,R1,all-year,all-week,morning,gasboiler,2040,0.95830000000 +1,heat,2050,9,R1,all-year,all-week,morning,heatpump,2040,1.62500000000 +1,heat,2050,10,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 +1,heat,2055,10,R1,all-year,all-week,morning,heatpump,2045,1.91670000000 +1,heat,2055,11,R1,all-year,all-week,morning,heatpump,2050,2.58330000000 +1,CO2f,2050,4,R1,all-year,all-week,morning,gasboiler,2040,62.01380000000 +2,heat,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,0.63890000000 +2,heat,2050,9,R1,all-year,all-week,afternoon,heatpump,2040,1.08330000000 +2,heat,2050,10,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 +2,heat,2055,10,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000 +2,heat,2055,11,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000 +2,CO2f,2050,4,R1,all-year,all-week,afternoon,gasboiler,2040,41.34250000000 +3,heat,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,0.95830000000 +3,heat,2050,9,R1,all-year,all-week,early-peak,heatpump,2040,1.62500000000 +3,heat,2050,10,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 +3,heat,2055,10,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000 +3,heat,2055,11,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000 +3,CO2f,2050,4,R1,all-year,all-week,early-peak,gasboiler,2040,62.01380000000 +4,heat,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,1.91670000000 +4,heat,2050,9,R1,all-year,all-week,late-peak,heatpump,2040,3.25000000000 +4,heat,2050,10,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 +4,heat,2055,10,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000 +4,heat,2055,11,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000 +4,CO2f,2050,4,R1,all-year,all-week,late-peak,gasboiler,2040,124.02750000000 +5,heat,2050,4,R1,all-year,all-week,evening,gasboiler,2040,1.27780000000 +5,heat,2050,9,R1,all-year,all-week,evening,heatpump,2040,2.16670000000 +5,heat,2050,10,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 +5,heat,2055,10,R1,all-year,all-week,evening,heatpump,2045,2.55560000000 +5,heat,2055,11,R1,all-year,all-week,evening,heatpump,2050,3.44440000000 +5,CO2f,2050,4,R1,all-year,all-week,evening,gasboiler,2040,82.68500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv index 1d065eaf0..b69168ca7 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New -gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.4,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5 -heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.4,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5 +gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5 +heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5 diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py index 9beedbee2..184eae27c 100644 --- a/docs/tutorial-code/2-add-agent/generate_models.py +++ b/docs/tutorial-code/2-add-agent/generate_models.py @@ -77,12 +77,6 @@ def generate_model_2(): df.loc[df["Name"] == "A2", "Objsort2"] = True df.to_csv(agents_file, index=False) - # Modify residential sector MaxCapacityGrowth - technodata_file = model_path / "technodata/residential/Technodata.csv" - df = pd.read_csv(technodata_file) - df.loc[1:, "MaxCapacityGrowth"] = 0.4 - df.to_csv(technodata_file, index=False) - if __name__ == "__main__": generate_model_1() From 42646d571e5cd9d28db3bcae9683da499b17692c Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 9 Aug 2024 17:12:31 +0100 Subject: [PATCH 5/6] Modify notebook --- docs/user-guide/add-agent.ipynb | 90 ++++++++++++++------------------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb index b75d7cc0c..61ce267c5 100644 --- a/docs/user-guide/add-agent.ipynb +++ b/docs/user-guide/add-agent.ipynb @@ -11,7 +11,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "In this section, we will add a new agent. We will continue to use the files from the previous tutorial where we added `solarPV` and created a new scenario. We will start by creating a new agent `A2` with identical properties to the existing agent `A1`, before modifying the investment strategies of the new agent.\n", + "In this section, we will add a new agent. We will continue to use the files from the previous tutorial where we added `solarPV` and created a new scenario. Compared to the original agent, which bases investment decisions on minimising [LCOE](https://en.wikipedia.org/wiki/Levelized_cost_of_electricity), the second agent will aim to minimise fuel consumption costs.\n", "\n", "To achieve this, first, we must modify the ```Agents.csv``` file in the directory:\n", "\n", @@ -22,16 +22,14 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "To start with, we will copy the data from the first two rows of agent `A1`, creating a new agent `A2` with identical objectives to `A1`. \n", - "\n", - "Also notice that we amend the `Quantity` column. The reason for this is that we want to specify that Agent A1 makes up 50% of the population, and A2 makes up the remaining 50% of the population.\n", + "To start with, we will copy the data for agent `A1` to create a new agent `A2`, and we will change the objective of this agent to `fuel_consumption_cost`. Also notice that we amend the `Quantity` column. The reason for this is that we want to specify that Agent `A1` makes up 50% of the population, and `A2` makes up the remaining 50% of the population.\n", "\n", "Again, we only show some of the columns due to space constraints, however see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv) for the full file.\n", "\n", "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|Quantity|…|Type|\n", "|-|-|-|-|-|-|-|-|-|-|-|-|-|\n", "|Agent1|A1|R1|LCOE|||1||…|singleObj|**0.5**|…|New|\n", - "|**Agent2**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|**0.5**|…|**New**|" + "|**Agent2**|**A2**|**R1**|**fuel_consumption_cost**|||**1**||…|**singleObj**|**0.5**|…|**New**|" ] }, { @@ -93,7 +91,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "This time we can see that there is data for the new agent, `A2`. Next, we will visualise the investments made by each of the agents using seaborn's facetgrid command." + "This time we can see that there is data for the new agent, `A2`. Next, we will visualise the investments made by each of the agents using seaborn's facetgrid command. For simplicity, we will only visualise the residential sector." ] }, { @@ -105,56 +103,50 @@ "mca_capacity = pd.read_csv(\n", " \"../tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv\"\n", ")\n", - "all_years = mca_capacity[\"year\"].unique()\n", - "\n", - "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n", - " sector_capacity = (\n", - " sector_data.groupby([\"year\", \"agent\", \"technology\"]).sum().reset_index()\n", - " )\n", - " g = sns.FacetGrid(data=sector_capacity, col=\"agent\")\n", - " g.map_dataframe(\n", - " lambda data, **kwargs: data.pivot(\n", - " index=\"year\", columns=\"technology\", values=\"capacity\"\n", - " )\n", - " .reindex(all_years)\n", - " .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n", - " )\n", - " g.add_legend()\n", - " g.set_ylabels(\"Capacity (PJ)\")\n", - " g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n", - " g.figure.subplots_adjust(top=0.8)" + "sector_data = mca_capacity[mca_capacity[\"sector\"] == \"residential\"]\n", + "sector_capacity = (\n", + " sector_data.groupby([\"year\", \"agent\", \"technology\"]).sum().reset_index()\n", + ")\n", + "g = sns.FacetGrid(data=sector_capacity, col=\"agent\")\n", + "g.map_dataframe(\n", + " lambda data, **kwargs: data.pivot(\n", + " index=\"year\", columns=\"technology\", values=\"capacity\"\n", + " ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n", + ")\n", + "g.add_legend()\n", + "g.set_ylabels(\"Capacity (PJ)\")\n", + "g.figure.suptitle(\"Residential Sector:\")\n", + "g.figure.subplots_adjust(top=0.8)" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "In this scenario, with both agents running the same objective, identical results between agents can be seen. There is large uptake in `windturbine` early on, whilst `solarPV` is invested in especially in later years where a change in the price of `solarPV` was set in the previous tutorial." + "We can see different results between the two agents. Whilst agent `A1` invests heavily in heat pumps, agent `A2` invests mostly in gas boilers, due to the lower fuel costs of this technology." ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "Next, we will see what occurs if the agents invest based upon different investment strategies. We will modify `A2` to make investments based upon a mixture of [levelised cost of electricity (LCOE)](https://en.wikipedia.org/wiki/Levelized_cost_of_energy) and [equivalent annual cost (EAC)](https://en.wikipedia.org/wiki/Equivalent_annual_cost). These two objectives will be combined by calculating a weighted sum of the two when comparing potential investment options. We will give both LCOE and EAC a relative weight value of 0.5.\n", + "We can also use multiple objectives for a single agent, combining objectives by taking a weighted sum. We will try this for agent A2, using both `fuel_consumption_cost` and `LCOE` with relative weights of 0.5 each.\n", "\n", "To do this, we need to modify the `Objective2`, `ObjData1`, `ObjData2`, `Objsort2` and `DecisionMethod` columns in the ```Agents.csv``` file, to look like the following:\n", "\n", "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|Objsort2|…|DecisionMethod|Quantity|…|Type|\n", "|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|\n", "|Agent1|A1|R1|LCOE|||1||…||…|singleObj|0.5|…|New|\n", - "|Agent2|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|…|**True**|**…**|**weighted_sum**|0.5|…|New|" + "|Agent2|A2|R1|fuel_consumption_cost|**LCOE**||**0.5**|**0.5**|…|**True**|**…**|**weighted_sum**|0.5|…|New|" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "The `Objsort2` parameter indicates that the new objective should be minimised, rather than maximised.\n", + "The `Objsort2` parameter indicates that the second objective should be minimised, rather than maximised.\n", "\n", - "We will then re-run the simulation. You may find that the simulation fails to complete due to insufficient capacity limits in the `residential` sector. In this case, try doubling `MaxCapacityGrowth` for `gasboiler` and `heatpump` in the `technodata/residential/Technodata.csv` file to 0.4 and running the simulation again.\n", - "\n", - "Once the model has run to completion, we can visualise the results as before:" + "We will then re-run the simulation. Once the model has run to completion, we can visualise the results as before:" ] }, { @@ -166,31 +158,27 @@ "mca_capacity = pd.read_csv(\n", " \"../tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv\"\n", ")\n", - "all_years = mca_capacity[\"year\"].unique()\n", - "\n", - "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n", - " sector_capacity = (\n", - " sector_data.groupby([\"year\", \"agent\", \"technology\"]).sum().reset_index()\n", - " )\n", - " g = sns.FacetGrid(data=sector_capacity, col=\"agent\")\n", - " g.map_dataframe(\n", - " lambda data, **kwargs: data.pivot(\n", - " index=\"year\", columns=\"technology\", values=\"capacity\"\n", - " )\n", - " .reindex(all_years)\n", - " .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n", - " )\n", - " g.add_legend()\n", - " g.set_ylabels(\"Capacity (PJ)\")\n", - " g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n", - " g.figure.subplots_adjust(top=0.8)" + "sector_data = mca_capacity[mca_capacity[\"sector\"] == \"residential\"]\n", + "sector_capacity = (\n", + " sector_data.groupby([\"year\", \"agent\", \"technology\"]).sum().reset_index()\n", + ")\n", + "g = sns.FacetGrid(data=sector_capacity, col=\"agent\")\n", + "g.map_dataframe(\n", + " lambda data, **kwargs: data.pivot(\n", + " index=\"year\", columns=\"technology\", values=\"capacity\"\n", + " ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n", + ")\n", + "g.add_legend()\n", + "g.set_ylabels(\"Capacity (PJ)\")\n", + "g.figure.suptitle(\"Residential Sector:\")\n", + "g.figure.subplots_adjust(top=0.8)" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "In this scenario we can see two divergent strategies. Both agents invest heavily in `windturbine` early on, and relatively little in `gasCCGT`. The share of `solarPV` increases in later years as the price falls (as set in the previous tutorial), but this increase is more dramatic for agent `A2`.\n", + "In this scenario we can see that agent `A2` has an intermediate behaviour compared to the two agents in the first simulation, investing in both gas boilers and heat pumps throughout the length of the simulation.\n", "\n", "From this small scenario, the difference between investment strategies between agents is evident. This is one of the key benefits of agent-based models when compared to optimisation-based models.\n", "\n", @@ -233,7 +221,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.12.4" } }, "nbformat": 4, From 86e30d844bcd4f2c3d06f962b08afe024923cfe8 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 9 Aug 2024 17:31:43 +0100 Subject: [PATCH 6/6] Tutorial 2 now based on default model --- .../Results/Gas/Capacity/2035.csv | 20 +- .../Results/Gas/Capacity/2040.csv | 42 ++-- .../Results/Gas/Capacity/2045.csv | 66 +++--- .../Results/Gas/Capacity/2050.csv | 100 ++++----- .../Results/MCACapacity.csv | 58 +++--- .../1-single-objective/Results/MCAPrices.csv | 96 ++++----- .../Results/Power/Capacity/2030.csv | 50 ++--- .../Results/Power/Capacity/2035.csv | 88 ++++---- .../Results/Power/Capacity/2040.csv | 120 +++++------ .../Results/Power/Capacity/2045.csv | 152 ++++++-------- .../Results/Power/Capacity/2050.csv | 194 ++++++++---------- .../input/BaseYearExport.csv | 42 ++-- .../input/BaseYearImport.csv | 42 ++-- .../input/GlobalCommodities.csv | 9 +- .../1-single-objective/input/Projections.csv | 42 ++-- .../1-single-objective/settings.toml | 2 +- .../technodata/power/CommIn.csv | 12 +- .../technodata/power/CommOut.csv | 12 +- .../technodata/power/ExistingCapacity.csv | 1 - .../technodata/power/Technodata.csv | 4 - .../preset/Residential2020Consumption.csv | 14 +- .../preset/Residential2050Consumption.csv | 14 +- .../Results/Gas/Capacity/2030.csv | 18 +- .../Results/Gas/Capacity/2035.csv | 38 ++-- .../Results/Gas/Capacity/2040.csv | 38 ++-- .../Results/Gas/Capacity/2045.csv | 38 ++-- .../Results/Gas/Capacity/2050.csv | 38 ++-- .../Results/MCACapacity.csv | 86 ++++---- .../Results/MCAPrices.csv | 120 +++++------ .../Results/Power/Capacity/2025.csv | 26 +-- .../Results/Power/Capacity/2030.csv | 42 ++-- .../Results/Power/Capacity/2035.csv | 80 ++++---- .../Results/Power/Capacity/2040.csv | 112 +++++----- .../Results/Power/Capacity/2045.csv | 134 ++++++------ .../Results/Power/Capacity/2050.csv | 190 ++++++++--------- .../input/BaseYearExport.csv | 42 ++-- .../input/BaseYearImport.csv | 42 ++-- .../input/GlobalCommodities.csv | 9 +- .../input/Projections.csv | 42 ++-- .../2-multiple-objective/settings.toml | 2 +- .../technodata/power/CommIn.csv | 12 +- .../technodata/power/CommOut.csv | 12 +- .../technodata/power/ExistingCapacity.csv | 1 - .../technodata/power/Technodata.csv | 4 - .../preset/Residential2020Consumption.csv | 14 +- .../preset/Residential2050Consumption.csv | 14 +- .../2-add-agent/generate_models.py | 9 +- docs/user-guide/add-agent.ipynb | 12 +- docs/user-guide/add-region.ipynb | 2 +- docs/user-guide/add-solar.ipynb | 2 +- 50 files changed, 1119 insertions(+), 1240 deletions(-) diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv index 1ca7fb8cf..6e128e532 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv @@ -24,13 +24,13 @@ asset,year,region,technology,installed,capacity 2,2064,R1,gassupply1,2030,14.17140000000 2,2065,R1,gassupply1,2030,14.17140000000 2,2069,R1,gassupply1,2030,14.17140000000 -3,2040,R1,gassupply1,2035,2.15190000000 -3,2045,R1,gassupply1,2035,2.15190000000 -3,2050,R1,gassupply1,2035,2.15190000000 -3,2059,R1,gassupply1,2035,2.15190000000 -3,2060,R1,gassupply1,2035,2.15190000000 -3,2064,R1,gassupply1,2035,2.15190000000 -3,2065,R1,gassupply1,2035,2.15190000000 -3,2069,R1,gassupply1,2035,2.15190000000 -3,2070,R1,gassupply1,2035,2.15190000000 -3,2074,R1,gassupply1,2035,2.15190000000 +3,2040,R1,gassupply1,2035,2.23740000000 +3,2045,R1,gassupply1,2035,2.23740000000 +3,2050,R1,gassupply1,2035,2.23740000000 +3,2059,R1,gassupply1,2035,2.23740000000 +3,2060,R1,gassupply1,2035,2.23740000000 +3,2064,R1,gassupply1,2035,2.23740000000 +3,2065,R1,gassupply1,2035,2.23740000000 +3,2069,R1,gassupply1,2035,2.23740000000 +3,2070,R1,gassupply1,2035,2.23740000000 +3,2074,R1,gassupply1,2035,2.23740000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv index 016360220..3c56a41b5 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv @@ -24,24 +24,24 @@ asset,year,region,technology,installed,capacity 2,2064,R1,gassupply1,2030,14.17140000000 2,2065,R1,gassupply1,2030,14.17140000000 2,2069,R1,gassupply1,2030,14.17140000000 -3,2040,R1,gassupply1,2035,2.15190000000 -3,2045,R1,gassupply1,2035,2.15190000000 -3,2050,R1,gassupply1,2035,2.15190000000 -3,2059,R1,gassupply1,2035,2.15190000000 -3,2060,R1,gassupply1,2035,2.15190000000 -3,2064,R1,gassupply1,2035,2.15190000000 -3,2065,R1,gassupply1,2035,2.15190000000 -3,2069,R1,gassupply1,2035,2.15190000000 -3,2070,R1,gassupply1,2035,2.15190000000 -3,2074,R1,gassupply1,2035,2.15190000000 -4,2045,R1,gassupply1,2040,4.00130000000 -4,2050,R1,gassupply1,2040,4.00130000000 -4,2059,R1,gassupply1,2040,4.00130000000 -4,2060,R1,gassupply1,2040,4.00130000000 -4,2064,R1,gassupply1,2040,4.00130000000 -4,2065,R1,gassupply1,2040,4.00130000000 -4,2069,R1,gassupply1,2040,4.00130000000 -4,2070,R1,gassupply1,2040,4.00130000000 -4,2074,R1,gassupply1,2040,4.00130000000 -4,2075,R1,gassupply1,2040,4.00130000000 -4,2079,R1,gassupply1,2040,4.00130000000 +3,2040,R1,gassupply1,2035,2.23740000000 +3,2045,R1,gassupply1,2035,2.23740000000 +3,2050,R1,gassupply1,2035,2.23740000000 +3,2059,R1,gassupply1,2035,2.23740000000 +3,2060,R1,gassupply1,2035,2.23740000000 +3,2064,R1,gassupply1,2035,2.23740000000 +3,2065,R1,gassupply1,2035,2.23740000000 +3,2069,R1,gassupply1,2035,2.23740000000 +3,2070,R1,gassupply1,2035,2.23740000000 +3,2074,R1,gassupply1,2035,2.23740000000 +4,2045,R1,gassupply1,2040,4.13670000000 +4,2050,R1,gassupply1,2040,4.13670000000 +4,2059,R1,gassupply1,2040,4.13670000000 +4,2060,R1,gassupply1,2040,4.13670000000 +4,2064,R1,gassupply1,2040,4.13670000000 +4,2065,R1,gassupply1,2040,4.13670000000 +4,2069,R1,gassupply1,2040,4.13670000000 +4,2070,R1,gassupply1,2040,4.13670000000 +4,2074,R1,gassupply1,2040,4.13670000000 +4,2075,R1,gassupply1,2040,4.13670000000 +4,2079,R1,gassupply1,2040,4.13670000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv index 308aa5566..bfcbe5612 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv @@ -24,36 +24,36 @@ asset,year,region,technology,installed,capacity 2,2064,R1,gassupply1,2030,14.17140000000 2,2065,R1,gassupply1,2030,14.17140000000 2,2069,R1,gassupply1,2030,14.17140000000 -3,2040,R1,gassupply1,2035,2.15190000000 -3,2045,R1,gassupply1,2035,2.15190000000 -3,2050,R1,gassupply1,2035,2.15190000000 -3,2059,R1,gassupply1,2035,2.15190000000 -3,2060,R1,gassupply1,2035,2.15190000000 -3,2064,R1,gassupply1,2035,2.15190000000 -3,2065,R1,gassupply1,2035,2.15190000000 -3,2069,R1,gassupply1,2035,2.15190000000 -3,2070,R1,gassupply1,2035,2.15190000000 -3,2074,R1,gassupply1,2035,2.15190000000 -4,2045,R1,gassupply1,2040,4.00130000000 -4,2050,R1,gassupply1,2040,4.00130000000 -4,2059,R1,gassupply1,2040,4.00130000000 -4,2060,R1,gassupply1,2040,4.00130000000 -4,2064,R1,gassupply1,2040,4.00130000000 -4,2065,R1,gassupply1,2040,4.00130000000 -4,2069,R1,gassupply1,2040,4.00130000000 -4,2070,R1,gassupply1,2040,4.00130000000 -4,2074,R1,gassupply1,2040,4.00130000000 -4,2075,R1,gassupply1,2040,4.00130000000 -4,2079,R1,gassupply1,2040,4.00130000000 -5,2050,R1,gassupply1,2045,3.79120000000 -5,2059,R1,gassupply1,2045,3.79120000000 -5,2060,R1,gassupply1,2045,3.79120000000 -5,2064,R1,gassupply1,2045,3.79120000000 -5,2065,R1,gassupply1,2045,3.79120000000 -5,2069,R1,gassupply1,2045,3.79120000000 -5,2070,R1,gassupply1,2045,3.79120000000 -5,2074,R1,gassupply1,2045,3.79120000000 -5,2075,R1,gassupply1,2045,3.79120000000 -5,2079,R1,gassupply1,2045,3.79120000000 -5,2080,R1,gassupply1,2045,3.79120000000 -5,2084,R1,gassupply1,2045,3.79120000000 +3,2040,R1,gassupply1,2035,2.23740000000 +3,2045,R1,gassupply1,2035,2.23740000000 +3,2050,R1,gassupply1,2035,2.23740000000 +3,2059,R1,gassupply1,2035,2.23740000000 +3,2060,R1,gassupply1,2035,2.23740000000 +3,2064,R1,gassupply1,2035,2.23740000000 +3,2065,R1,gassupply1,2035,2.23740000000 +3,2069,R1,gassupply1,2035,2.23740000000 +3,2070,R1,gassupply1,2035,2.23740000000 +3,2074,R1,gassupply1,2035,2.23740000000 +4,2045,R1,gassupply1,2040,4.13670000000 +4,2050,R1,gassupply1,2040,4.13670000000 +4,2059,R1,gassupply1,2040,4.13670000000 +4,2060,R1,gassupply1,2040,4.13670000000 +4,2064,R1,gassupply1,2040,4.13670000000 +4,2065,R1,gassupply1,2040,4.13670000000 +4,2069,R1,gassupply1,2040,4.13670000000 +4,2070,R1,gassupply1,2040,4.13670000000 +4,2074,R1,gassupply1,2040,4.13670000000 +4,2075,R1,gassupply1,2040,4.13670000000 +4,2079,R1,gassupply1,2040,4.13670000000 +5,2050,R1,gassupply1,2045,3.86350000000 +5,2059,R1,gassupply1,2045,3.86350000000 +5,2060,R1,gassupply1,2045,3.86350000000 +5,2064,R1,gassupply1,2045,3.86350000000 +5,2065,R1,gassupply1,2045,3.86350000000 +5,2069,R1,gassupply1,2045,3.86350000000 +5,2070,R1,gassupply1,2045,3.86350000000 +5,2074,R1,gassupply1,2045,3.86350000000 +5,2075,R1,gassupply1,2045,3.86350000000 +5,2079,R1,gassupply1,2045,3.86350000000 +5,2080,R1,gassupply1,2045,3.86350000000 +5,2084,R1,gassupply1,2045,3.86350000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv index 29c2adbbb..9670c0e07 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv @@ -27,53 +27,53 @@ asset,year,region,technology,installed,capacity 2,2064,R1,gassupply1,2030,14.17140000000 2,2065,R1,gassupply1,2030,14.17140000000 2,2069,R1,gassupply1,2030,14.17140000000 -3,2040,R1,gassupply1,2035,2.15190000000 -3,2045,R1,gassupply1,2035,2.15190000000 -3,2050,R1,gassupply1,2035,2.15190000000 -3,2055,R1,gassupply1,2035,2.15190000000 -3,2059,R1,gassupply1,2035,2.15190000000 -3,2060,R1,gassupply1,2035,2.15190000000 -3,2064,R1,gassupply1,2035,2.15190000000 -3,2065,R1,gassupply1,2035,2.15190000000 -3,2069,R1,gassupply1,2035,2.15190000000 -3,2070,R1,gassupply1,2035,2.15190000000 -3,2074,R1,gassupply1,2035,2.15190000000 -4,2045,R1,gassupply1,2040,4.00130000000 -4,2050,R1,gassupply1,2040,4.00130000000 -4,2055,R1,gassupply1,2040,4.00130000000 -4,2059,R1,gassupply1,2040,4.00130000000 -4,2060,R1,gassupply1,2040,4.00130000000 -4,2064,R1,gassupply1,2040,4.00130000000 -4,2065,R1,gassupply1,2040,4.00130000000 -4,2069,R1,gassupply1,2040,4.00130000000 -4,2070,R1,gassupply1,2040,4.00130000000 -4,2074,R1,gassupply1,2040,4.00130000000 -4,2075,R1,gassupply1,2040,4.00130000000 -4,2079,R1,gassupply1,2040,4.00130000000 -5,2050,R1,gassupply1,2045,3.79120000000 -5,2055,R1,gassupply1,2045,3.79120000000 -5,2059,R1,gassupply1,2045,3.79120000000 -5,2060,R1,gassupply1,2045,3.79120000000 -5,2064,R1,gassupply1,2045,3.79120000000 -5,2065,R1,gassupply1,2045,3.79120000000 -5,2069,R1,gassupply1,2045,3.79120000000 -5,2070,R1,gassupply1,2045,3.79120000000 -5,2074,R1,gassupply1,2045,3.79120000000 -5,2075,R1,gassupply1,2045,3.79120000000 -5,2079,R1,gassupply1,2045,3.79120000000 -5,2080,R1,gassupply1,2045,3.79120000000 -5,2084,R1,gassupply1,2045,3.79120000000 -6,2055,R1,gassupply1,2050,0.47320000000 -6,2059,R1,gassupply1,2050,0.47320000000 -6,2060,R1,gassupply1,2050,0.47320000000 -6,2064,R1,gassupply1,2050,0.47320000000 -6,2065,R1,gassupply1,2050,0.47320000000 -6,2069,R1,gassupply1,2050,0.47320000000 -6,2070,R1,gassupply1,2050,0.47320000000 -6,2074,R1,gassupply1,2050,0.47320000000 -6,2075,R1,gassupply1,2050,0.47320000000 -6,2079,R1,gassupply1,2050,0.47320000000 -6,2080,R1,gassupply1,2050,0.47320000000 -6,2084,R1,gassupply1,2050,0.47320000000 -6,2085,R1,gassupply1,2050,0.47320000000 -6,2089,R1,gassupply1,2050,0.47320000000 +3,2040,R1,gassupply1,2035,2.23740000000 +3,2045,R1,gassupply1,2035,2.23740000000 +3,2050,R1,gassupply1,2035,2.23740000000 +3,2055,R1,gassupply1,2035,2.23740000000 +3,2059,R1,gassupply1,2035,2.23740000000 +3,2060,R1,gassupply1,2035,2.23740000000 +3,2064,R1,gassupply1,2035,2.23740000000 +3,2065,R1,gassupply1,2035,2.23740000000 +3,2069,R1,gassupply1,2035,2.23740000000 +3,2070,R1,gassupply1,2035,2.23740000000 +3,2074,R1,gassupply1,2035,2.23740000000 +4,2045,R1,gassupply1,2040,4.13670000000 +4,2050,R1,gassupply1,2040,4.13670000000 +4,2055,R1,gassupply1,2040,4.13670000000 +4,2059,R1,gassupply1,2040,4.13670000000 +4,2060,R1,gassupply1,2040,4.13670000000 +4,2064,R1,gassupply1,2040,4.13670000000 +4,2065,R1,gassupply1,2040,4.13670000000 +4,2069,R1,gassupply1,2040,4.13670000000 +4,2070,R1,gassupply1,2040,4.13670000000 +4,2074,R1,gassupply1,2040,4.13670000000 +4,2075,R1,gassupply1,2040,4.13670000000 +4,2079,R1,gassupply1,2040,4.13670000000 +5,2050,R1,gassupply1,2045,3.86350000000 +5,2055,R1,gassupply1,2045,3.86350000000 +5,2059,R1,gassupply1,2045,3.86350000000 +5,2060,R1,gassupply1,2045,3.86350000000 +5,2064,R1,gassupply1,2045,3.86350000000 +5,2065,R1,gassupply1,2045,3.86350000000 +5,2069,R1,gassupply1,2045,3.86350000000 +5,2070,R1,gassupply1,2045,3.86350000000 +5,2074,R1,gassupply1,2045,3.86350000000 +5,2075,R1,gassupply1,2045,3.86350000000 +5,2079,R1,gassupply1,2045,3.86350000000 +5,2080,R1,gassupply1,2045,3.86350000000 +5,2084,R1,gassupply1,2045,3.86350000000 +6,2055,R1,gassupply1,2050,0.60370000000 +6,2059,R1,gassupply1,2050,0.60370000000 +6,2060,R1,gassupply1,2050,0.60370000000 +6,2064,R1,gassupply1,2050,0.60370000000 +6,2065,R1,gassupply1,2050,0.60370000000 +6,2069,R1,gassupply1,2050,0.60370000000 +6,2070,R1,gassupply1,2050,0.60370000000 +6,2074,R1,gassupply1,2050,0.60370000000 +6,2075,R1,gassupply1,2050,0.60370000000 +6,2079,R1,gassupply1,2050,0.60370000000 +6,2080,R1,gassupply1,2050,0.60370000000 +6,2084,R1,gassupply1,2050,0.60370000000 +6,2085,R1,gassupply1,2050,0.60370000000 +6,2089,R1,gassupply1,2050,0.60370000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv index 800b4944a..e97b28dd7 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv @@ -33,7 +33,7 @@ A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2035 A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,0.12500000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2035 A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2035 A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2035 A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2035 @@ -49,71 +49,71 @@ A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2040 A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,0.12500000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,0.62500000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,0.18750000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,0.19440000000,R1,2035,R1,power,gasCCGT,newcapa,2040 +A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2040 A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2040 A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,0.81250000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,1.06250000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2045 A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,0.12500000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,0.62500000000,R1,2035,R1,power,solarPV,newcapa,2045 -A1,1.75000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,0.18750000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,0.19440000000,R1,2035,R1,power,gasCCGT,newcapa,2045 +A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2045 A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2045 A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,0.81250000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,1.06250000000,R1,2035,R1,power,windturbine,newcapa,2045 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,2.00060000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A1,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,2.06830000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A2,2.00060000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A2,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,2.06830000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2050 A1,2.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.12500000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,0.62500000000,R1,2035,R1,power,solarPV,newcapa,2050 -A1,1.75000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,1.50000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,0.18750000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,0.19440000000,R1,2035,R1,power,gasCCGT,newcapa,2050 +A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 A2,6.18750000000,R1,2025,R1,power,windturbine,newcapa,2050 A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,0.81250000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,1.06250000000,R1,2035,R1,power,windturbine,newcapa,2050 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,3.53130000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,3.40630000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,2.00060000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,1.89560000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,2.06830000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.93170000000,R1,2045,R1,gas,gassupply1,newcapa,2050 A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A2,6.08830000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A2,7.08570000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,1.07600000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A2,2.00060000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A2,1.89560000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,1.11870000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,2.06830000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.93170000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv index 7d98d75d3..3950e30c4 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv @@ -71,99 +71,99 @@ electricity,all-week,evening,all-year,8.65200000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,6.78180000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.09640000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.09690000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.61730000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.61740000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,11.09640000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,11.09690000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.61730000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.61740000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.09640000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.09690000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.61730000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.61740000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,11.09640000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,11.09690000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.61730000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.61740000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,11.09640000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.09690000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.61730000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.61740000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,11.09640000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,11.09690000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.61730000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.61740000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,12.65780000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,12.93350000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.80230000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,11.85740000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,12.65780000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.93350000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.80230000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.85740000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,12.65780000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,12.93350000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,11.80230000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,11.85740000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,12.65780000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.93350000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.80230000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.85740000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,12.65780000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,12.93350000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.80230000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.85740000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,12.65780000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,12.93350000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.80230000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,11.85740000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,13.87290000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,14.38770000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,14.67220000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,14.77520000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,13.87290000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,14.38770000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,14.67220000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,14.77520000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,13.87290000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,14.38770000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,14.67220000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,14.77520000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,13.87290000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,14.38770000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,14.67220000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,14.77520000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,13.87290000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,14.38770000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,14.67220000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,14.77520000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,13.87290000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.38770000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,14.67220000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,14.77520000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,15.06010000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,15.72370000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,17.53660000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,17.66930000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,15.06010000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,15.72370000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,17.53660000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,17.66930000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,15.06010000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,15.72370000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,17.53660000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,17.66930000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,15.06010000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,15.72370000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,17.53660000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,17.66930000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,15.06010000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,15.72370000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,17.53660000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,17.66930000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,15.06010000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.72370000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,17.53660000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,17.66930000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv index 9a6408950..c6cfd7bd3 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv @@ -21,32 +21,24 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,2.75000000000 1,2060,R1,gasCCGT,2025,2.75000000000 1,2064,R1,gasCCGT,2025,2.75000000000 -2,2035,R1,solarPV,2030,0.12500000000 -2,2040,R1,solarPV,2030,0.12500000000 -2,2045,R1,solarPV,2030,0.12500000000 -2,2049,R1,solarPV,2030,0.12500000000 -2,2050,R1,solarPV,2030,0.12500000000 -2,2054,R1,solarPV,2030,0.12500000000 -2,2055,R1,solarPV,2030,0.12500000000 -2,2059,R1,solarPV,2030,0.12500000000 -3,2025,R1,windturbine,2020,2.31250000000 -3,2030,R1,windturbine,2020,2.31250000000 -3,2035,R1,windturbine,2020,2.31250000000 -3,2040,R1,windturbine,2020,2.31250000000 -3,2045,R1,windturbine,2020,2.31250000000 -3,2049,R1,windturbine,2020,2.31250000000 -4,2030,R1,windturbine,2025,6.18750000000 -4,2035,R1,windturbine,2025,6.18750000000 -4,2040,R1,windturbine,2025,6.18750000000 -4,2045,R1,windturbine,2025,6.18750000000 -4,2049,R1,windturbine,2025,6.18750000000 -4,2050,R1,windturbine,2025,6.18750000000 -4,2054,R1,windturbine,2025,6.18750000000 -5,2035,R1,windturbine,2030,0.25000000000 -5,2040,R1,windturbine,2030,0.25000000000 -5,2045,R1,windturbine,2030,0.25000000000 -5,2049,R1,windturbine,2030,0.25000000000 -5,2050,R1,windturbine,2030,0.25000000000 -5,2054,R1,windturbine,2030,0.25000000000 -5,2055,R1,windturbine,2030,0.25000000000 -5,2059,R1,windturbine,2030,0.25000000000 +2,2025,R1,windturbine,2020,2.31250000000 +2,2030,R1,windturbine,2020,2.31250000000 +2,2035,R1,windturbine,2020,2.31250000000 +2,2040,R1,windturbine,2020,2.31250000000 +2,2045,R1,windturbine,2020,2.31250000000 +2,2049,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2025,6.18750000000 +3,2035,R1,windturbine,2025,6.18750000000 +3,2040,R1,windturbine,2025,6.18750000000 +3,2045,R1,windturbine,2025,6.18750000000 +3,2049,R1,windturbine,2025,6.18750000000 +3,2050,R1,windturbine,2025,6.18750000000 +3,2054,R1,windturbine,2025,6.18750000000 +4,2035,R1,windturbine,2030,0.37500000000 +4,2040,R1,windturbine,2030,0.37500000000 +4,2045,R1,windturbine,2030,0.37500000000 +4,2049,R1,windturbine,2030,0.37500000000 +4,2050,R1,windturbine,2030,0.37500000000 +4,2054,R1,windturbine,2030,0.37500000000 +4,2055,R1,windturbine,2030,0.37500000000 +4,2059,R1,windturbine,2030,0.37500000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv index a8439422a..b708e6914 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv @@ -21,50 +21,44 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,2.75000000000 1,2060,R1,gasCCGT,2025,2.75000000000 1,2064,R1,gasCCGT,2025,2.75000000000 -2,2035,R1,solarPV,2030,0.12500000000 -2,2040,R1,solarPV,2030,0.12500000000 -2,2045,R1,solarPV,2030,0.12500000000 -2,2049,R1,solarPV,2030,0.12500000000 -2,2050,R1,solarPV,2030,0.12500000000 -2,2054,R1,solarPV,2030,0.12500000000 -2,2055,R1,solarPV,2030,0.12500000000 -2,2059,R1,solarPV,2030,0.12500000000 -3,2040,R1,solarPV,2035,0.62500000000 -3,2045,R1,solarPV,2035,0.62500000000 -3,2049,R1,solarPV,2035,0.62500000000 -3,2050,R1,solarPV,2035,0.62500000000 -3,2054,R1,solarPV,2035,0.62500000000 -3,2055,R1,solarPV,2035,0.62500000000 -3,2059,R1,solarPV,2035,0.62500000000 -3,2060,R1,solarPV,2035,0.62500000000 -3,2064,R1,solarPV,2035,0.62500000000 -4,2025,R1,windturbine,2020,2.31250000000 -4,2030,R1,windturbine,2020,2.31250000000 -4,2035,R1,windturbine,2020,2.31250000000 -4,2040,R1,windturbine,2020,2.31250000000 -4,2045,R1,windturbine,2020,2.31250000000 -4,2049,R1,windturbine,2020,2.31250000000 -5,2030,R1,windturbine,2025,6.18750000000 -5,2035,R1,windturbine,2025,6.18750000000 -5,2040,R1,windturbine,2025,6.18750000000 -5,2045,R1,windturbine,2025,6.18750000000 -5,2049,R1,windturbine,2025,6.18750000000 -5,2050,R1,windturbine,2025,6.18750000000 -5,2054,R1,windturbine,2025,6.18750000000 -6,2035,R1,windturbine,2030,0.25000000000 -6,2040,R1,windturbine,2030,0.25000000000 -6,2045,R1,windturbine,2030,0.25000000000 -6,2049,R1,windturbine,2030,0.25000000000 -6,2050,R1,windturbine,2030,0.25000000000 -6,2054,R1,windturbine,2030,0.25000000000 -6,2055,R1,windturbine,2030,0.25000000000 -6,2059,R1,windturbine,2030,0.25000000000 -7,2040,R1,windturbine,2035,1.00000000000 -7,2045,R1,windturbine,2035,1.00000000000 -7,2049,R1,windturbine,2035,1.00000000000 -7,2050,R1,windturbine,2035,1.00000000000 -7,2054,R1,windturbine,2035,1.00000000000 -7,2055,R1,windturbine,2035,1.00000000000 -7,2059,R1,windturbine,2035,1.00000000000 -7,2060,R1,windturbine,2035,1.00000000000 -7,2064,R1,windturbine,2035,1.00000000000 +2,2040,R1,gasCCGT,2035,0.19440000000 +2,2045,R1,gasCCGT,2035,0.19440000000 +2,2049,R1,gasCCGT,2035,0.19440000000 +2,2050,R1,gasCCGT,2035,0.19440000000 +2,2054,R1,gasCCGT,2035,0.19440000000 +2,2055,R1,gasCCGT,2035,0.19440000000 +2,2059,R1,gasCCGT,2035,0.19440000000 +2,2060,R1,gasCCGT,2035,0.19440000000 +2,2064,R1,gasCCGT,2035,0.19440000000 +2,2065,R1,gasCCGT,2035,0.19440000000 +2,2074,R1,gasCCGT,2035,0.19440000000 +3,2025,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2020,2.31250000000 +3,2035,R1,windturbine,2020,2.31250000000 +3,2040,R1,windturbine,2020,2.31250000000 +3,2045,R1,windturbine,2020,2.31250000000 +3,2049,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2025,6.18750000000 +4,2035,R1,windturbine,2025,6.18750000000 +4,2040,R1,windturbine,2025,6.18750000000 +4,2045,R1,windturbine,2025,6.18750000000 +4,2049,R1,windturbine,2025,6.18750000000 +4,2050,R1,windturbine,2025,6.18750000000 +4,2054,R1,windturbine,2025,6.18750000000 +5,2035,R1,windturbine,2030,0.37500000000 +5,2040,R1,windturbine,2030,0.37500000000 +5,2045,R1,windturbine,2030,0.37500000000 +5,2049,R1,windturbine,2030,0.37500000000 +5,2050,R1,windturbine,2030,0.37500000000 +5,2054,R1,windturbine,2030,0.37500000000 +5,2055,R1,windturbine,2030,0.37500000000 +5,2059,R1,windturbine,2030,0.37500000000 +6,2040,R1,windturbine,2035,1.68750000000 +6,2045,R1,windturbine,2035,1.68750000000 +6,2049,R1,windturbine,2035,1.68750000000 +6,2050,R1,windturbine,2035,1.68750000000 +6,2054,R1,windturbine,2035,1.68750000000 +6,2055,R1,windturbine,2035,1.68750000000 +6,2059,R1,windturbine,2035,1.68750000000 +6,2060,R1,windturbine,2035,1.68750000000 +6,2064,R1,windturbine,2035,1.68750000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv index d25518a14..39f135fd6 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv @@ -21,70 +21,56 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,2.75000000000 1,2060,R1,gasCCGT,2025,2.75000000000 1,2064,R1,gasCCGT,2025,2.75000000000 -2,2035,R1,solarPV,2030,0.12500000000 -2,2040,R1,solarPV,2030,0.12500000000 -2,2045,R1,solarPV,2030,0.12500000000 -2,2049,R1,solarPV,2030,0.12500000000 -2,2050,R1,solarPV,2030,0.12500000000 -2,2054,R1,solarPV,2030,0.12500000000 -2,2055,R1,solarPV,2030,0.12500000000 -2,2059,R1,solarPV,2030,0.12500000000 -3,2040,R1,solarPV,2035,0.62500000000 -3,2045,R1,solarPV,2035,0.62500000000 -3,2049,R1,solarPV,2035,0.62500000000 -3,2050,R1,solarPV,2035,0.62500000000 -3,2054,R1,solarPV,2035,0.62500000000 -3,2055,R1,solarPV,2035,0.62500000000 -3,2059,R1,solarPV,2035,0.62500000000 -3,2060,R1,solarPV,2035,0.62500000000 -3,2064,R1,solarPV,2035,0.62500000000 -4,2045,R1,solarPV,2040,1.75000000000 -4,2049,R1,solarPV,2040,1.75000000000 -4,2050,R1,solarPV,2040,1.75000000000 -4,2054,R1,solarPV,2040,1.75000000000 -4,2055,R1,solarPV,2040,1.75000000000 -4,2059,R1,solarPV,2040,1.75000000000 -4,2060,R1,solarPV,2040,1.75000000000 -4,2064,R1,solarPV,2040,1.75000000000 -4,2065,R1,solarPV,2040,1.75000000000 -4,2069,R1,solarPV,2040,1.75000000000 -5,2025,R1,windturbine,2020,2.31250000000 -5,2030,R1,windturbine,2020,2.31250000000 -5,2035,R1,windturbine,2020,2.31250000000 -5,2040,R1,windturbine,2020,2.31250000000 -5,2045,R1,windturbine,2020,2.31250000000 -5,2049,R1,windturbine,2020,2.31250000000 -6,2030,R1,windturbine,2025,6.18750000000 -6,2035,R1,windturbine,2025,6.18750000000 -6,2040,R1,windturbine,2025,6.18750000000 -6,2045,R1,windturbine,2025,6.18750000000 -6,2049,R1,windturbine,2025,6.18750000000 -6,2050,R1,windturbine,2025,6.18750000000 -6,2054,R1,windturbine,2025,6.18750000000 -7,2035,R1,windturbine,2030,0.25000000000 -7,2040,R1,windturbine,2030,0.25000000000 -7,2045,R1,windturbine,2030,0.25000000000 -7,2049,R1,windturbine,2030,0.25000000000 -7,2050,R1,windturbine,2030,0.25000000000 -7,2054,R1,windturbine,2030,0.25000000000 -7,2055,R1,windturbine,2030,0.25000000000 -7,2059,R1,windturbine,2030,0.25000000000 -8,2040,R1,windturbine,2035,1.00000000000 -8,2045,R1,windturbine,2035,1.00000000000 -8,2049,R1,windturbine,2035,1.00000000000 -8,2050,R1,windturbine,2035,1.00000000000 -8,2054,R1,windturbine,2035,1.00000000000 -8,2055,R1,windturbine,2035,1.00000000000 -8,2059,R1,windturbine,2035,1.00000000000 -8,2060,R1,windturbine,2035,1.00000000000 -8,2064,R1,windturbine,2035,1.00000000000 -9,2045,R1,windturbine,2040,1.50000000000 -9,2049,R1,windturbine,2040,1.50000000000 -9,2050,R1,windturbine,2040,1.50000000000 -9,2054,R1,windturbine,2040,1.50000000000 -9,2055,R1,windturbine,2040,1.50000000000 -9,2059,R1,windturbine,2040,1.50000000000 -9,2060,R1,windturbine,2040,1.50000000000 -9,2064,R1,windturbine,2040,1.50000000000 -9,2065,R1,windturbine,2040,1.50000000000 -9,2069,R1,windturbine,2040,1.50000000000 +2,2040,R1,gasCCGT,2035,0.19440000000 +2,2045,R1,gasCCGT,2035,0.19440000000 +2,2049,R1,gasCCGT,2035,0.19440000000 +2,2050,R1,gasCCGT,2035,0.19440000000 +2,2054,R1,gasCCGT,2035,0.19440000000 +2,2055,R1,gasCCGT,2035,0.19440000000 +2,2059,R1,gasCCGT,2035,0.19440000000 +2,2060,R1,gasCCGT,2035,0.19440000000 +2,2064,R1,gasCCGT,2035,0.19440000000 +2,2065,R1,gasCCGT,2035,0.19440000000 +2,2069,R1,gasCCGT,2035,0.19440000000 +2,2070,R1,gasCCGT,2035,0.19440000000 +2,2074,R1,gasCCGT,2035,0.19440000000 +3,2025,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2020,2.31250000000 +3,2035,R1,windturbine,2020,2.31250000000 +3,2040,R1,windturbine,2020,2.31250000000 +3,2045,R1,windturbine,2020,2.31250000000 +3,2049,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2025,6.18750000000 +4,2035,R1,windturbine,2025,6.18750000000 +4,2040,R1,windturbine,2025,6.18750000000 +4,2045,R1,windturbine,2025,6.18750000000 +4,2049,R1,windturbine,2025,6.18750000000 +4,2050,R1,windturbine,2025,6.18750000000 +4,2054,R1,windturbine,2025,6.18750000000 +5,2035,R1,windturbine,2030,0.37500000000 +5,2040,R1,windturbine,2030,0.37500000000 +5,2045,R1,windturbine,2030,0.37500000000 +5,2049,R1,windturbine,2030,0.37500000000 +5,2050,R1,windturbine,2030,0.37500000000 +5,2054,R1,windturbine,2030,0.37500000000 +5,2055,R1,windturbine,2030,0.37500000000 +5,2059,R1,windturbine,2030,0.37500000000 +6,2040,R1,windturbine,2035,1.68750000000 +6,2045,R1,windturbine,2035,1.68750000000 +6,2049,R1,windturbine,2035,1.68750000000 +6,2050,R1,windturbine,2035,1.68750000000 +6,2054,R1,windturbine,2035,1.68750000000 +6,2055,R1,windturbine,2035,1.68750000000 +6,2059,R1,windturbine,2035,1.68750000000 +6,2060,R1,windturbine,2035,1.68750000000 +6,2064,R1,windturbine,2035,1.68750000000 +7,2045,R1,windturbine,2040,3.00000000000 +7,2049,R1,windturbine,2040,3.00000000000 +7,2050,R1,windturbine,2040,3.00000000000 +7,2054,R1,windturbine,2040,3.00000000000 +7,2055,R1,windturbine,2040,3.00000000000 +7,2059,R1,windturbine,2040,3.00000000000 +7,2060,R1,windturbine,2040,3.00000000000 +7,2064,R1,windturbine,2040,3.00000000000 +7,2065,R1,windturbine,2040,3.00000000000 +7,2069,R1,windturbine,2040,3.00000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv index dfede315c..f245616ec 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv @@ -21,91 +21,67 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,2.75000000000 1,2060,R1,gasCCGT,2025,2.75000000000 1,2064,R1,gasCCGT,2025,2.75000000000 -2,2035,R1,solarPV,2030,0.12500000000 -2,2040,R1,solarPV,2030,0.12500000000 -2,2045,R1,solarPV,2030,0.12500000000 -2,2049,R1,solarPV,2030,0.12500000000 -2,2050,R1,solarPV,2030,0.12500000000 -2,2054,R1,solarPV,2030,0.12500000000 -2,2055,R1,solarPV,2030,0.12500000000 -2,2059,R1,solarPV,2030,0.12500000000 -3,2040,R1,solarPV,2035,0.62500000000 -3,2045,R1,solarPV,2035,0.62500000000 -3,2049,R1,solarPV,2035,0.62500000000 -3,2050,R1,solarPV,2035,0.62500000000 -3,2054,R1,solarPV,2035,0.62500000000 -3,2055,R1,solarPV,2035,0.62500000000 -3,2059,R1,solarPV,2035,0.62500000000 -3,2060,R1,solarPV,2035,0.62500000000 -3,2064,R1,solarPV,2035,0.62500000000 -4,2045,R1,solarPV,2040,1.75000000000 -4,2049,R1,solarPV,2040,1.75000000000 -4,2050,R1,solarPV,2040,1.75000000000 -4,2054,R1,solarPV,2040,1.75000000000 -4,2055,R1,solarPV,2040,1.75000000000 -4,2059,R1,solarPV,2040,1.75000000000 -4,2060,R1,solarPV,2040,1.75000000000 -4,2064,R1,solarPV,2040,1.75000000000 -4,2065,R1,solarPV,2040,1.75000000000 -4,2069,R1,solarPV,2040,1.75000000000 -5,2049,R1,solarPV,2045,1.20000000000 -5,2050,R1,solarPV,2045,1.50000000000 -5,2054,R1,solarPV,2045,1.50000000000 -5,2055,R1,solarPV,2045,1.50000000000 -5,2059,R1,solarPV,2045,1.50000000000 -5,2060,R1,solarPV,2045,1.50000000000 -5,2064,R1,solarPV,2045,1.50000000000 -5,2065,R1,solarPV,2045,1.50000000000 -5,2069,R1,solarPV,2045,1.50000000000 -5,2070,R1,solarPV,2045,1.50000000000 -5,2074,R1,solarPV,2045,1.50000000000 -6,2025,R1,windturbine,2020,2.31250000000 -6,2030,R1,windturbine,2020,2.31250000000 -6,2035,R1,windturbine,2020,2.31250000000 -6,2040,R1,windturbine,2020,2.31250000000 -6,2045,R1,windturbine,2020,2.31250000000 -6,2049,R1,windturbine,2020,2.31250000000 -7,2030,R1,windturbine,2025,6.18750000000 -7,2035,R1,windturbine,2025,6.18750000000 -7,2040,R1,windturbine,2025,6.18750000000 -7,2045,R1,windturbine,2025,6.18750000000 -7,2049,R1,windturbine,2025,6.18750000000 -7,2050,R1,windturbine,2025,6.18750000000 -7,2054,R1,windturbine,2025,6.18750000000 -8,2035,R1,windturbine,2030,0.25000000000 -8,2040,R1,windturbine,2030,0.25000000000 -8,2045,R1,windturbine,2030,0.25000000000 -8,2049,R1,windturbine,2030,0.25000000000 -8,2050,R1,windturbine,2030,0.25000000000 -8,2054,R1,windturbine,2030,0.25000000000 -8,2055,R1,windturbine,2030,0.25000000000 -8,2059,R1,windturbine,2030,0.25000000000 -9,2040,R1,windturbine,2035,1.00000000000 -9,2045,R1,windturbine,2035,1.00000000000 -9,2049,R1,windturbine,2035,1.00000000000 -9,2050,R1,windturbine,2035,1.00000000000 -9,2054,R1,windturbine,2035,1.00000000000 -9,2055,R1,windturbine,2035,1.00000000000 -9,2059,R1,windturbine,2035,1.00000000000 -9,2060,R1,windturbine,2035,1.00000000000 -9,2064,R1,windturbine,2035,1.00000000000 -10,2045,R1,windturbine,2040,1.50000000000 -10,2049,R1,windturbine,2040,1.50000000000 -10,2050,R1,windturbine,2040,1.50000000000 -10,2054,R1,windturbine,2040,1.50000000000 -10,2055,R1,windturbine,2040,1.50000000000 -10,2059,R1,windturbine,2040,1.50000000000 -10,2060,R1,windturbine,2040,1.50000000000 -10,2064,R1,windturbine,2040,1.50000000000 -10,2065,R1,windturbine,2040,1.50000000000 -10,2069,R1,windturbine,2040,1.50000000000 -11,2050,R1,windturbine,2045,3.53130000000 -11,2054,R1,windturbine,2045,3.53130000000 -11,2055,R1,windturbine,2045,3.53130000000 -11,2059,R1,windturbine,2045,3.53130000000 -11,2060,R1,windturbine,2045,3.53130000000 -11,2064,R1,windturbine,2045,3.53130000000 -11,2065,R1,windturbine,2045,3.53130000000 -11,2069,R1,windturbine,2045,3.53130000000 -11,2070,R1,windturbine,2045,3.53130000000 -11,2074,R1,windturbine,2045,3.53130000000 +2,2040,R1,gasCCGT,2035,0.19440000000 +2,2045,R1,gasCCGT,2035,0.19440000000 +2,2049,R1,gasCCGT,2035,0.19440000000 +2,2050,R1,gasCCGT,2035,0.19440000000 +2,2054,R1,gasCCGT,2035,0.19440000000 +2,2055,R1,gasCCGT,2035,0.19440000000 +2,2059,R1,gasCCGT,2035,0.19440000000 +2,2060,R1,gasCCGT,2035,0.19440000000 +2,2064,R1,gasCCGT,2035,0.19440000000 +2,2065,R1,gasCCGT,2035,0.19440000000 +2,2069,R1,gasCCGT,2035,0.19440000000 +2,2070,R1,gasCCGT,2035,0.19440000000 +2,2074,R1,gasCCGT,2035,0.19440000000 +3,2025,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2020,2.31250000000 +3,2035,R1,windturbine,2020,2.31250000000 +3,2040,R1,windturbine,2020,2.31250000000 +3,2045,R1,windturbine,2020,2.31250000000 +3,2049,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2025,6.18750000000 +4,2035,R1,windturbine,2025,6.18750000000 +4,2040,R1,windturbine,2025,6.18750000000 +4,2045,R1,windturbine,2025,6.18750000000 +4,2049,R1,windturbine,2025,6.18750000000 +4,2050,R1,windturbine,2025,6.18750000000 +4,2054,R1,windturbine,2025,6.18750000000 +5,2035,R1,windturbine,2030,0.37500000000 +5,2040,R1,windturbine,2030,0.37500000000 +5,2045,R1,windturbine,2030,0.37500000000 +5,2049,R1,windturbine,2030,0.37500000000 +5,2050,R1,windturbine,2030,0.37500000000 +5,2054,R1,windturbine,2030,0.37500000000 +5,2055,R1,windturbine,2030,0.37500000000 +5,2059,R1,windturbine,2030,0.37500000000 +6,2040,R1,windturbine,2035,1.68750000000 +6,2045,R1,windturbine,2035,1.68750000000 +6,2049,R1,windturbine,2035,1.68750000000 +6,2050,R1,windturbine,2035,1.68750000000 +6,2054,R1,windturbine,2035,1.68750000000 +6,2055,R1,windturbine,2035,1.68750000000 +6,2059,R1,windturbine,2035,1.68750000000 +6,2060,R1,windturbine,2035,1.68750000000 +6,2064,R1,windturbine,2035,1.68750000000 +7,2045,R1,windturbine,2040,3.00000000000 +7,2049,R1,windturbine,2040,3.00000000000 +7,2050,R1,windturbine,2040,3.00000000000 +7,2054,R1,windturbine,2040,3.00000000000 +7,2055,R1,windturbine,2040,3.00000000000 +7,2059,R1,windturbine,2040,3.00000000000 +7,2060,R1,windturbine,2040,3.00000000000 +7,2064,R1,windturbine,2040,3.00000000000 +7,2065,R1,windturbine,2040,3.00000000000 +7,2069,R1,windturbine,2040,3.00000000000 +8,2049,R1,windturbine,2045,1.20000000000 +8,2050,R1,windturbine,2045,4.90630000000 +8,2054,R1,windturbine,2045,4.90630000000 +8,2055,R1,windturbine,2045,4.90630000000 +8,2059,R1,windturbine,2045,4.90630000000 +8,2060,R1,windturbine,2045,4.90630000000 +8,2064,R1,windturbine,2045,4.90630000000 +8,2065,R1,windturbine,2045,4.90630000000 +8,2069,R1,windturbine,2045,4.90630000000 +8,2070,R1,windturbine,2045,4.90630000000 +8,2074,R1,windturbine,2045,4.90630000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv index 1678ee949..64f6cd647 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv @@ -21,111 +21,89 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,2.75000000000 1,2060,R1,gasCCGT,2025,2.75000000000 1,2064,R1,gasCCGT,2025,2.75000000000 -2,2035,R1,solarPV,2030,0.12500000000 -2,2040,R1,solarPV,2030,0.12500000000 -2,2045,R1,solarPV,2030,0.12500000000 -2,2049,R1,solarPV,2030,0.12500000000 -2,2050,R1,solarPV,2030,0.12500000000 -2,2054,R1,solarPV,2030,0.12500000000 -2,2055,R1,solarPV,2030,0.12500000000 -2,2059,R1,solarPV,2030,0.12500000000 -3,2040,R1,solarPV,2035,0.62500000000 -3,2045,R1,solarPV,2035,0.62500000000 -3,2049,R1,solarPV,2035,0.62500000000 -3,2050,R1,solarPV,2035,0.62500000000 -3,2054,R1,solarPV,2035,0.62500000000 -3,2055,R1,solarPV,2035,0.62500000000 -3,2059,R1,solarPV,2035,0.62500000000 -3,2060,R1,solarPV,2035,0.62500000000 -3,2064,R1,solarPV,2035,0.62500000000 -4,2045,R1,solarPV,2040,1.75000000000 -4,2049,R1,solarPV,2040,1.75000000000 -4,2050,R1,solarPV,2040,1.75000000000 -4,2054,R1,solarPV,2040,1.75000000000 -4,2055,R1,solarPV,2040,1.75000000000 -4,2059,R1,solarPV,2040,1.75000000000 -4,2060,R1,solarPV,2040,1.75000000000 -4,2064,R1,solarPV,2040,1.75000000000 -4,2065,R1,solarPV,2040,1.75000000000 -4,2069,R1,solarPV,2040,1.75000000000 -5,2049,R1,solarPV,2045,1.20000000000 -5,2050,R1,solarPV,2045,1.50000000000 -5,2054,R1,solarPV,2045,1.50000000000 -5,2055,R1,solarPV,2045,1.50000000000 -5,2059,R1,solarPV,2045,1.50000000000 -5,2060,R1,solarPV,2045,1.50000000000 -5,2064,R1,solarPV,2045,1.50000000000 -5,2065,R1,solarPV,2045,1.50000000000 -5,2069,R1,solarPV,2045,1.50000000000 -5,2070,R1,solarPV,2045,1.50000000000 -5,2074,R1,solarPV,2045,1.50000000000 -6,2055,R1,solarPV,2050,10.00000000000 -6,2059,R1,solarPV,2050,10.00000000000 -6,2060,R1,solarPV,2050,10.00000000000 -6,2064,R1,solarPV,2050,10.00000000000 -6,2065,R1,solarPV,2050,10.00000000000 -6,2069,R1,solarPV,2050,10.00000000000 -6,2070,R1,solarPV,2050,10.00000000000 -6,2074,R1,solarPV,2050,10.00000000000 -6,2075,R1,solarPV,2050,10.00000000000 -6,2079,R1,solarPV,2050,10.00000000000 -7,2025,R1,windturbine,2020,2.31250000000 -7,2030,R1,windturbine,2020,2.31250000000 -7,2035,R1,windturbine,2020,2.31250000000 -7,2040,R1,windturbine,2020,2.31250000000 -7,2045,R1,windturbine,2020,2.31250000000 -7,2049,R1,windturbine,2020,2.31250000000 -8,2030,R1,windturbine,2025,6.18750000000 -8,2035,R1,windturbine,2025,6.18750000000 -8,2040,R1,windturbine,2025,6.18750000000 -8,2045,R1,windturbine,2025,6.18750000000 -8,2049,R1,windturbine,2025,6.18750000000 -8,2050,R1,windturbine,2025,6.18750000000 -8,2054,R1,windturbine,2025,6.18750000000 -9,2035,R1,windturbine,2030,0.25000000000 -9,2040,R1,windturbine,2030,0.25000000000 -9,2045,R1,windturbine,2030,0.25000000000 -9,2049,R1,windturbine,2030,0.25000000000 -9,2050,R1,windturbine,2030,0.25000000000 -9,2054,R1,windturbine,2030,0.25000000000 -9,2055,R1,windturbine,2030,0.25000000000 -9,2059,R1,windturbine,2030,0.25000000000 -10,2040,R1,windturbine,2035,1.00000000000 -10,2045,R1,windturbine,2035,1.00000000000 -10,2049,R1,windturbine,2035,1.00000000000 -10,2050,R1,windturbine,2035,1.00000000000 -10,2054,R1,windturbine,2035,1.00000000000 -10,2055,R1,windturbine,2035,1.00000000000 -10,2059,R1,windturbine,2035,1.00000000000 -10,2060,R1,windturbine,2035,1.00000000000 -10,2064,R1,windturbine,2035,1.00000000000 -11,2045,R1,windturbine,2040,1.50000000000 -11,2049,R1,windturbine,2040,1.50000000000 -11,2050,R1,windturbine,2040,1.50000000000 -11,2054,R1,windturbine,2040,1.50000000000 -11,2055,R1,windturbine,2040,1.50000000000 -11,2059,R1,windturbine,2040,1.50000000000 -11,2060,R1,windturbine,2040,1.50000000000 -11,2064,R1,windturbine,2040,1.50000000000 -11,2065,R1,windturbine,2040,1.50000000000 -11,2069,R1,windturbine,2040,1.50000000000 -12,2050,R1,windturbine,2045,3.53130000000 -12,2054,R1,windturbine,2045,3.53130000000 -12,2055,R1,windturbine,2045,3.53130000000 -12,2059,R1,windturbine,2045,3.53130000000 -12,2060,R1,windturbine,2045,3.53130000000 -12,2064,R1,windturbine,2045,3.53130000000 -12,2065,R1,windturbine,2045,3.53130000000 -12,2069,R1,windturbine,2045,3.53130000000 -12,2070,R1,windturbine,2045,3.53130000000 -12,2074,R1,windturbine,2045,3.53130000000 -13,2055,R1,windturbine,2050,0.45310000000 -13,2059,R1,windturbine,2050,0.45310000000 -13,2060,R1,windturbine,2050,0.45310000000 -13,2064,R1,windturbine,2050,0.45310000000 -13,2065,R1,windturbine,2050,0.45310000000 -13,2069,R1,windturbine,2050,0.45310000000 -13,2070,R1,windturbine,2050,0.45310000000 -13,2074,R1,windturbine,2050,0.45310000000 -13,2075,R1,windturbine,2050,0.45310000000 -13,2079,R1,windturbine,2050,0.45310000000 +2,2040,R1,gasCCGT,2035,0.19440000000 +2,2045,R1,gasCCGT,2035,0.19440000000 +2,2049,R1,gasCCGT,2035,0.19440000000 +2,2050,R1,gasCCGT,2035,0.19440000000 +2,2054,R1,gasCCGT,2035,0.19440000000 +2,2055,R1,gasCCGT,2035,0.19440000000 +2,2059,R1,gasCCGT,2035,0.19440000000 +2,2060,R1,gasCCGT,2035,0.19440000000 +2,2064,R1,gasCCGT,2035,0.19440000000 +2,2065,R1,gasCCGT,2035,0.19440000000 +2,2069,R1,gasCCGT,2035,0.19440000000 +2,2070,R1,gasCCGT,2035,0.19440000000 +2,2074,R1,gasCCGT,2035,0.19440000000 +3,2055,R1,gasCCGT,2050,0.17360000000 +3,2059,R1,gasCCGT,2050,0.17360000000 +3,2060,R1,gasCCGT,2050,0.17360000000 +3,2064,R1,gasCCGT,2050,0.17360000000 +3,2065,R1,gasCCGT,2050,0.17360000000 +3,2069,R1,gasCCGT,2050,0.17360000000 +3,2070,R1,gasCCGT,2050,0.17360000000 +3,2074,R1,gasCCGT,2050,0.17360000000 +3,2075,R1,gasCCGT,2050,0.17360000000 +3,2079,R1,gasCCGT,2050,0.17360000000 +3,2080,R1,gasCCGT,2050,0.17360000000 +3,2089,R1,gasCCGT,2050,0.17360000000 +4,2025,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2020,2.31250000000 +4,2035,R1,windturbine,2020,2.31250000000 +4,2040,R1,windturbine,2020,2.31250000000 +4,2045,R1,windturbine,2020,2.31250000000 +4,2049,R1,windturbine,2020,2.31250000000 +5,2030,R1,windturbine,2025,6.18750000000 +5,2035,R1,windturbine,2025,6.18750000000 +5,2040,R1,windturbine,2025,6.18750000000 +5,2045,R1,windturbine,2025,6.18750000000 +5,2049,R1,windturbine,2025,6.18750000000 +5,2050,R1,windturbine,2025,6.18750000000 +5,2054,R1,windturbine,2025,6.18750000000 +6,2035,R1,windturbine,2030,0.37500000000 +6,2040,R1,windturbine,2030,0.37500000000 +6,2045,R1,windturbine,2030,0.37500000000 +6,2049,R1,windturbine,2030,0.37500000000 +6,2050,R1,windturbine,2030,0.37500000000 +6,2054,R1,windturbine,2030,0.37500000000 +6,2055,R1,windturbine,2030,0.37500000000 +6,2059,R1,windturbine,2030,0.37500000000 +7,2040,R1,windturbine,2035,1.68750000000 +7,2045,R1,windturbine,2035,1.68750000000 +7,2049,R1,windturbine,2035,1.68750000000 +7,2050,R1,windturbine,2035,1.68750000000 +7,2054,R1,windturbine,2035,1.68750000000 +7,2055,R1,windturbine,2035,1.68750000000 +7,2059,R1,windturbine,2035,1.68750000000 +7,2060,R1,windturbine,2035,1.68750000000 +7,2064,R1,windturbine,2035,1.68750000000 +8,2045,R1,windturbine,2040,3.00000000000 +8,2049,R1,windturbine,2040,3.00000000000 +8,2050,R1,windturbine,2040,3.00000000000 +8,2054,R1,windturbine,2040,3.00000000000 +8,2055,R1,windturbine,2040,3.00000000000 +8,2059,R1,windturbine,2040,3.00000000000 +8,2060,R1,windturbine,2040,3.00000000000 +8,2064,R1,windturbine,2040,3.00000000000 +8,2065,R1,windturbine,2040,3.00000000000 +8,2069,R1,windturbine,2040,3.00000000000 +9,2049,R1,windturbine,2045,1.20000000000 +9,2050,R1,windturbine,2045,4.90630000000 +9,2054,R1,windturbine,2045,4.90630000000 +9,2055,R1,windturbine,2045,4.90630000000 +9,2059,R1,windturbine,2045,4.90630000000 +9,2060,R1,windturbine,2045,4.90630000000 +9,2064,R1,windturbine,2045,4.90630000000 +9,2065,R1,windturbine,2045,4.90630000000 +9,2069,R1,windturbine,2045,4.90630000000 +9,2070,R1,windturbine,2045,4.90630000000 +9,2074,R1,windturbine,2045,4.90630000000 +10,2055,R1,windturbine,2050,10.00000000000 +10,2059,R1,windturbine,2050,10.00000000000 +10,2060,R1,windturbine,2050,10.00000000000 +10,2064,R1,windturbine,2050,10.00000000000 +10,2065,R1,windturbine,2050,10.00000000000 +10,2069,R1,windturbine,2050,10.00000000000 +10,2070,R1,windturbine,2050,10.00000000000 +10,2074,R1,windturbine,2050,10.00000000000 +10,2075,R1,windturbine,2050,10.00000000000 +10,2079,R1,windturbine,2050,10.00000000000 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearExport.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearExport.csv index 38c886d3c..7218c1fcb 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearExport.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearExport.csv @@ -1,21 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Exports,2010,0,0,0,0,0,0 -R1,Exports,2015,0,0,0,0,0,0 -R1,Exports,2020,0,0,0,0,0,0 -R1,Exports,2025,0,0,0,0,0,0 -R1,Exports,2030,0,0,0,0,0,0 -R1,Exports,2035,0,0,0,0,0,0 -R1,Exports,2040,0,0,0,0,0,0 -R1,Exports,2045,0,0,0,0,0,0 -R1,Exports,2050,0,0,0,0,0,0 -R1,Exports,2055,0,0,0,0,0,0 -R1,Exports,2060,0,0,0,0,0,0 -R1,Exports,2065,0,0,0,0,0,0 -R1,Exports,2070,0,0,0,0,0,0 -R1,Exports,2075,0,0,0,0,0,0 -R1,Exports,2080,0,0,0,0,0,0 -R1,Exports,2085,0,0,0,0,0,0 -R1,Exports,2090,0,0,0,0,0,0 -R1,Exports,2095,0,0,0,0,0,0 -R1,Exports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Exports,2010,0,0,0,0,0 +R1,Exports,2015,0,0,0,0,0 +R1,Exports,2020,0,0,0,0,0 +R1,Exports,2025,0,0,0,0,0 +R1,Exports,2030,0,0,0,0,0 +R1,Exports,2035,0,0,0,0,0 +R1,Exports,2040,0,0,0,0,0 +R1,Exports,2045,0,0,0,0,0 +R1,Exports,2050,0,0,0,0,0 +R1,Exports,2055,0,0,0,0,0 +R1,Exports,2060,0,0,0,0,0 +R1,Exports,2065,0,0,0,0,0 +R1,Exports,2070,0,0,0,0,0 +R1,Exports,2075,0,0,0,0,0 +R1,Exports,2080,0,0,0,0,0 +R1,Exports,2085,0,0,0,0,0 +R1,Exports,2090,0,0,0,0,0 +R1,Exports,2095,0,0,0,0,0 +R1,Exports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv index 9c9cc695f..75b322762 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv @@ -1,21 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Imports,2010,0,0,0,0,0,0 -R1,Imports,2015,0,0,0,0,0,0 -R1,Imports,2020,0,0,0,0,0,0 -R1,Imports,2025,0,0,0,0,0,0 -R1,Imports,2030,0,0,0,0,0,0 -R1,Imports,2035,0,0,0,0,0,0 -R1,Imports,2040,0,0,0,0,0,0 -R1,Imports,2045,0,0,0,0,0,0 -R1,Imports,2050,0,0,0,0,0,0 -R1,Imports,2055,0,0,0,0,0,0 -R1,Imports,2060,0,0,0,0,0,0 -R1,Imports,2065,0,0,0,0,0,0 -R1,Imports,2070,0,0,0,0,0,0 -R1,Imports,2075,0,0,0,0,0,0 -R1,Imports,2080,0,0,0,0,0,0 -R1,Imports,2085,0,0,0,0,0,0 -R1,Imports,2090,0,0,0,0,0,0 -R1,Imports,2095,0,0,0,0,0,0 -R1,Imports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Imports,2010,0,0,0,0,0 +R1,Imports,2015,0,0,0,0,0 +R1,Imports,2020,0,0,0,0,0 +R1,Imports,2025,0,0,0,0,0 +R1,Imports,2030,0,0,0,0,0 +R1,Imports,2035,0,0,0,0,0 +R1,Imports,2040,0,0,0,0,0 +R1,Imports,2045,0,0,0,0,0 +R1,Imports,2050,0,0,0,0,0 +R1,Imports,2055,0,0,0,0,0 +R1,Imports,2060,0,0,0,0,0 +R1,Imports,2065,0,0,0,0,0 +R1,Imports,2070,0,0,0,0,0 +R1,Imports,2075,0,0,0,0,0 +R1,Imports,2080,0,0,0,0,0 +R1,Imports,2085,0,0,0,0,0 +R1,Imports,2090,0,0,0,0,0 +R1,Imports,2095,0,0,0,0,0 +R1,Imports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv index 9691db73d..0d4c58da7 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv @@ -1,7 +1,6 @@ Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit -Electricity,Energy,electricity,0.0,1,PJ +Electricity,Energy,electricity,0,1,PJ Gas,Energy,gas,56.1,1,PJ -Heat,Energy,heat,0.0,1,PJ -Wind,Energy,wind,0.0,1,PJ -CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt -Solar,Energy,solar,0.0,1,PJ +Heat,Energy,heat,0,1,PJ +Wind,Energy,wind,0,1,PJ +CO2fuelcomsbustion,Environmental,CO2f,0,1,kt diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv index 6a013889f..5b5e43261 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv @@ -1,21 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt -R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0 -R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0 -R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0 -R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0 -R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0 -R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0 -R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0 -R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0 -R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0 -R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0 -R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0 -R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0 -R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0 -R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0 -R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0 -R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0 -R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0 -R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0 -R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt +R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0 +R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0 +R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0 +R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0 +R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0 +R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0 +R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0 +R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0 +R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0 +R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0 +R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0 +R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0 +R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0 +R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0 +R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0 +R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0 +R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0 +R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0 +R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml index b297589a1..29306d1c9 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml +++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml @@ -6,7 +6,7 @@ regions = ["R1"] interest_rate = 0.1 interpolation_mode = 'Active' log_level = 'info' -excluded_commodities = ["wind", "solar"] +excluded_commodities = ["wind"] # Convergence parameters equilibrium_variable = 'demand' maximum_iterations = 100 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv index 7fe44c8a1..c78f9c6e1 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv @@ -1,8 +1,4 @@ -ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0 -windturbine,R1,2020,fixed,0,0,0,0,1,0 -windturbine,R1,2040,fixed,0,0,0,0,1,0 -solarPV,R1,2020,fixed,0,0,0,0,0,1 -solarPV,R1,2040,fixed,0,0,0,0,0,1 +ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind +Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,fixed,0,1.67,0,0,0 +windturbine,R1,2020,fixed,0,0,0,0,1 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv index 4659a4b1e..efaac0580 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv @@ -1,8 +1,4 @@ -ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,1,0,0,91.67,0,0 -gasCCGT,R1,2040,1,0,0,91.67,0,0 -windturbine,R1,2020,1,0,0,0,0,0 -windturbine,R1,2040,1,0,0,0,0,0 -solarPV,R1,2020,1,0,0,0,0,0 -solarPV,R1,2040,1,0,0,0,0,0 +ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,1,0,0,91.67,0 +windturbine,R1,2020,1,0,0,0,0 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv index 56b7b1fcc..2171d259c 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0 windturbine,R1,PJ/y,0,0,0,0,0,0,0 -solarPV,R1,PJ/y,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv index 32b439391..7489bc368 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv @@ -1,8 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5 -gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5 windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5 -windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5 -solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5 -solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv index 614627f27..06d71ed68 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv @@ -1,7 +1,7 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,1.0,0,0,0 -R1,2,0,0,1.5,0,0,0 -R1,3,0,0,1.0,0,0,0 -R1,4,0,0,1.5,0,0,0 -R1,5,0,0,3.0,0,0,0 -R1,6,0,0,2.0,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,1,0,0 +R1,2,0,0,1.5,0,0 +R1,3,0,0,1,0,0 +R1,4,0,0,1.5,0,0 +R1,5,0,0,3,0,0 +R1,6,0,0,2,0,0 diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv index c0bc70ac6..e6d7e03cc 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv +++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv @@ -1,7 +1,7 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,3.0,0,0,0 -R1,2,0,0,4.5,0,0,0 -R1,3,0,0,3.0,0,0,0 -R1,4,0,0,4.5,0,0,0 -R1,5,0,0,9.0,0,0,0 -R1,6,0,0,6.0,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,3,0,0 +R1,2,0,0,4.5,0,0 +R1,3,0,0,3,0,0 +R1,4,0,0,4.5,0,0 +R1,5,0,0,9,0,0 +R1,6,0,0,6,0,0 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv index 60c318837..116d44992 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv @@ -15,12 +15,12 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gassupply1,2025,10.34110000000 1,2060,R1,gassupply1,2025,10.34110000000 1,2064,R1,gassupply1,2025,10.34110000000 -2,2035,R1,gassupply1,2030,14.18760000000 -2,2040,R1,gassupply1,2030,14.18760000000 -2,2045,R1,gassupply1,2030,14.18760000000 -2,2050,R1,gassupply1,2030,14.18760000000 -2,2059,R1,gassupply1,2030,14.18760000000 -2,2060,R1,gassupply1,2030,14.18760000000 -2,2064,R1,gassupply1,2030,14.18760000000 -2,2065,R1,gassupply1,2030,14.18760000000 -2,2069,R1,gassupply1,2030,14.18760000000 +2,2035,R1,gassupply1,2030,14.17190000000 +2,2040,R1,gassupply1,2030,14.17190000000 +2,2045,R1,gassupply1,2030,14.17190000000 +2,2050,R1,gassupply1,2030,14.17190000000 +2,2059,R1,gassupply1,2030,14.17190000000 +2,2060,R1,gassupply1,2030,14.17190000000 +2,2064,R1,gassupply1,2030,14.17190000000 +2,2065,R1,gassupply1,2030,14.17190000000 +2,2069,R1,gassupply1,2030,14.17190000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv index 7e4cdc157..e1d2b15ae 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv @@ -15,22 +15,22 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gassupply1,2025,10.34110000000 1,2060,R1,gassupply1,2025,10.34110000000 1,2064,R1,gassupply1,2025,10.34110000000 -2,2035,R1,gassupply1,2030,14.18760000000 -2,2040,R1,gassupply1,2030,14.18760000000 -2,2045,R1,gassupply1,2030,14.18760000000 -2,2050,R1,gassupply1,2030,14.18760000000 -2,2059,R1,gassupply1,2030,14.18760000000 -2,2060,R1,gassupply1,2030,14.18760000000 -2,2064,R1,gassupply1,2030,14.18760000000 -2,2065,R1,gassupply1,2030,14.18760000000 -2,2069,R1,gassupply1,2030,14.18760000000 -3,2040,R1,gassupply1,2035,0.98850000000 -3,2045,R1,gassupply1,2035,0.98850000000 -3,2050,R1,gassupply1,2035,0.98850000000 -3,2059,R1,gassupply1,2035,0.98850000000 -3,2060,R1,gassupply1,2035,0.98850000000 -3,2064,R1,gassupply1,2035,0.98850000000 -3,2065,R1,gassupply1,2035,0.98850000000 -3,2069,R1,gassupply1,2035,0.98850000000 -3,2070,R1,gassupply1,2035,0.98850000000 -3,2074,R1,gassupply1,2035,0.98850000000 +2,2035,R1,gassupply1,2030,14.17190000000 +2,2040,R1,gassupply1,2030,14.17190000000 +2,2045,R1,gassupply1,2030,14.17190000000 +2,2050,R1,gassupply1,2030,14.17190000000 +2,2059,R1,gassupply1,2030,14.17190000000 +2,2060,R1,gassupply1,2030,14.17190000000 +2,2064,R1,gassupply1,2030,14.17190000000 +2,2065,R1,gassupply1,2030,14.17190000000 +2,2069,R1,gassupply1,2030,14.17190000000 +3,2040,R1,gassupply1,2035,3.92710000000 +3,2045,R1,gassupply1,2035,3.92710000000 +3,2050,R1,gassupply1,2035,3.92710000000 +3,2059,R1,gassupply1,2035,3.92710000000 +3,2060,R1,gassupply1,2035,3.92710000000 +3,2064,R1,gassupply1,2035,3.92710000000 +3,2065,R1,gassupply1,2035,3.92710000000 +3,2069,R1,gassupply1,2035,3.92710000000 +3,2070,R1,gassupply1,2035,3.92710000000 +3,2074,R1,gassupply1,2035,3.92710000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv index 7e4cdc157..e1d2b15ae 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv @@ -15,22 +15,22 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gassupply1,2025,10.34110000000 1,2060,R1,gassupply1,2025,10.34110000000 1,2064,R1,gassupply1,2025,10.34110000000 -2,2035,R1,gassupply1,2030,14.18760000000 -2,2040,R1,gassupply1,2030,14.18760000000 -2,2045,R1,gassupply1,2030,14.18760000000 -2,2050,R1,gassupply1,2030,14.18760000000 -2,2059,R1,gassupply1,2030,14.18760000000 -2,2060,R1,gassupply1,2030,14.18760000000 -2,2064,R1,gassupply1,2030,14.18760000000 -2,2065,R1,gassupply1,2030,14.18760000000 -2,2069,R1,gassupply1,2030,14.18760000000 -3,2040,R1,gassupply1,2035,0.98850000000 -3,2045,R1,gassupply1,2035,0.98850000000 -3,2050,R1,gassupply1,2035,0.98850000000 -3,2059,R1,gassupply1,2035,0.98850000000 -3,2060,R1,gassupply1,2035,0.98850000000 -3,2064,R1,gassupply1,2035,0.98850000000 -3,2065,R1,gassupply1,2035,0.98850000000 -3,2069,R1,gassupply1,2035,0.98850000000 -3,2070,R1,gassupply1,2035,0.98850000000 -3,2074,R1,gassupply1,2035,0.98850000000 +2,2035,R1,gassupply1,2030,14.17190000000 +2,2040,R1,gassupply1,2030,14.17190000000 +2,2045,R1,gassupply1,2030,14.17190000000 +2,2050,R1,gassupply1,2030,14.17190000000 +2,2059,R1,gassupply1,2030,14.17190000000 +2,2060,R1,gassupply1,2030,14.17190000000 +2,2064,R1,gassupply1,2030,14.17190000000 +2,2065,R1,gassupply1,2030,14.17190000000 +2,2069,R1,gassupply1,2030,14.17190000000 +3,2040,R1,gassupply1,2035,3.92710000000 +3,2045,R1,gassupply1,2035,3.92710000000 +3,2050,R1,gassupply1,2035,3.92710000000 +3,2059,R1,gassupply1,2035,3.92710000000 +3,2060,R1,gassupply1,2035,3.92710000000 +3,2064,R1,gassupply1,2035,3.92710000000 +3,2065,R1,gassupply1,2035,3.92710000000 +3,2069,R1,gassupply1,2035,3.92710000000 +3,2070,R1,gassupply1,2035,3.92710000000 +3,2074,R1,gassupply1,2035,3.92710000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv index 7e4cdc157..e1d2b15ae 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv @@ -15,22 +15,22 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gassupply1,2025,10.34110000000 1,2060,R1,gassupply1,2025,10.34110000000 1,2064,R1,gassupply1,2025,10.34110000000 -2,2035,R1,gassupply1,2030,14.18760000000 -2,2040,R1,gassupply1,2030,14.18760000000 -2,2045,R1,gassupply1,2030,14.18760000000 -2,2050,R1,gassupply1,2030,14.18760000000 -2,2059,R1,gassupply1,2030,14.18760000000 -2,2060,R1,gassupply1,2030,14.18760000000 -2,2064,R1,gassupply1,2030,14.18760000000 -2,2065,R1,gassupply1,2030,14.18760000000 -2,2069,R1,gassupply1,2030,14.18760000000 -3,2040,R1,gassupply1,2035,0.98850000000 -3,2045,R1,gassupply1,2035,0.98850000000 -3,2050,R1,gassupply1,2035,0.98850000000 -3,2059,R1,gassupply1,2035,0.98850000000 -3,2060,R1,gassupply1,2035,0.98850000000 -3,2064,R1,gassupply1,2035,0.98850000000 -3,2065,R1,gassupply1,2035,0.98850000000 -3,2069,R1,gassupply1,2035,0.98850000000 -3,2070,R1,gassupply1,2035,0.98850000000 -3,2074,R1,gassupply1,2035,0.98850000000 +2,2035,R1,gassupply1,2030,14.17190000000 +2,2040,R1,gassupply1,2030,14.17190000000 +2,2045,R1,gassupply1,2030,14.17190000000 +2,2050,R1,gassupply1,2030,14.17190000000 +2,2059,R1,gassupply1,2030,14.17190000000 +2,2060,R1,gassupply1,2030,14.17190000000 +2,2064,R1,gassupply1,2030,14.17190000000 +2,2065,R1,gassupply1,2030,14.17190000000 +2,2069,R1,gassupply1,2030,14.17190000000 +3,2040,R1,gassupply1,2035,3.92710000000 +3,2045,R1,gassupply1,2035,3.92710000000 +3,2050,R1,gassupply1,2035,3.92710000000 +3,2059,R1,gassupply1,2035,3.92710000000 +3,2060,R1,gassupply1,2035,3.92710000000 +3,2064,R1,gassupply1,2035,3.92710000000 +3,2065,R1,gassupply1,2035,3.92710000000 +3,2069,R1,gassupply1,2035,3.92710000000 +3,2070,R1,gassupply1,2035,3.92710000000 +3,2074,R1,gassupply1,2035,3.92710000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv index 7e4cdc157..e1d2b15ae 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv @@ -15,22 +15,22 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gassupply1,2025,10.34110000000 1,2060,R1,gassupply1,2025,10.34110000000 1,2064,R1,gassupply1,2025,10.34110000000 -2,2035,R1,gassupply1,2030,14.18760000000 -2,2040,R1,gassupply1,2030,14.18760000000 -2,2045,R1,gassupply1,2030,14.18760000000 -2,2050,R1,gassupply1,2030,14.18760000000 -2,2059,R1,gassupply1,2030,14.18760000000 -2,2060,R1,gassupply1,2030,14.18760000000 -2,2064,R1,gassupply1,2030,14.18760000000 -2,2065,R1,gassupply1,2030,14.18760000000 -2,2069,R1,gassupply1,2030,14.18760000000 -3,2040,R1,gassupply1,2035,0.98850000000 -3,2045,R1,gassupply1,2035,0.98850000000 -3,2050,R1,gassupply1,2035,0.98850000000 -3,2059,R1,gassupply1,2035,0.98850000000 -3,2060,R1,gassupply1,2035,0.98850000000 -3,2064,R1,gassupply1,2035,0.98850000000 -3,2065,R1,gassupply1,2035,0.98850000000 -3,2069,R1,gassupply1,2035,0.98850000000 -3,2070,R1,gassupply1,2035,0.98850000000 -3,2074,R1,gassupply1,2035,0.98850000000 +2,2035,R1,gassupply1,2030,14.17190000000 +2,2040,R1,gassupply1,2030,14.17190000000 +2,2045,R1,gassupply1,2030,14.17190000000 +2,2050,R1,gassupply1,2030,14.17190000000 +2,2059,R1,gassupply1,2030,14.17190000000 +2,2060,R1,gassupply1,2030,14.17190000000 +2,2064,R1,gassupply1,2030,14.17190000000 +2,2065,R1,gassupply1,2030,14.17190000000 +2,2069,R1,gassupply1,2030,14.17190000000 +3,2040,R1,gassupply1,2035,3.92710000000 +3,2045,R1,gassupply1,2035,3.92710000000 +3,2050,R1,gassupply1,2035,3.92710000000 +3,2059,R1,gassupply1,2035,3.92710000000 +3,2060,R1,gassupply1,2035,3.92710000000 +3,2064,R1,gassupply1,2035,3.92710000000 +3,2065,R1,gassupply1,2035,3.92710000000 +3,2069,R1,gassupply1,2035,3.92710000000 +3,2070,R1,gassupply1,2035,3.92710000000 +3,2074,R1,gassupply1,2035,3.92710000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv index e4eea1aaf..8d26262cb 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -22,8 +22,8 @@ A2,2.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A2,2.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2030 A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2030 A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2030 +A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A2,5.44390000000,R1,2020,R1,gas,gassupply1,newcapa,2030 @@ -35,16 +35,16 @@ A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A2,2.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2035 A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,0.08330000000,R1,2030,R1,power,solarPV,newcapa,2035 -A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2035 -A2,0.25000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2035 A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2035 +A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2035 +A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2035 A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 @@ -52,21 +52,21 @@ A2,4.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 A2,4.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2040 A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,0.08330000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,0.41670000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,0.75000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2040 -A2,0.25000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A2,1.58330000000,R1,2035,R1,power,solarPV,newcapa,2040 +A1,0.41670000000,R1,2035,R1,power,gasCCGT,newcapa,2040 +A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2040 +A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2040 +A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A2,1.56250000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,4.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 @@ -75,24 +75,23 @@ A2,4.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A2,4.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2045 A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,0.08330000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,0.41670000000,R1,2035,R1,power,solarPV,newcapa,2045 -A1,2.50000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,0.75000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,0.70830000000,R1,2040,R1,power,windturbine,newcapa,2045 -A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2045 -A2,0.25000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A2,1.58330000000,R1,2035,R1,power,solarPV,newcapa,2045 -A2,3.20830000000,R1,2040,R1,power,solarPV,newcapa,2045 +A1,0.41670000000,R1,2035,R1,power,gasCCGT,newcapa,2045 +A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A2,2.31250000000,R1,2020,R1,power,windturbine,newcapa,2045 +A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2045 +A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A2,1.56250000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050 @@ -100,22 +99,21 @@ A2,4.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,1.02780000000,R1,2020,R1,power,gasCCGT,newcapa,2050 A1,3.19440000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.08330000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,0.41670000000,R1,2035,R1,power,solarPV,newcapa,2050 -A1,2.50000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,2.90630000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,0.75000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,0.70830000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,7.18750000000,R1,2025,R1,power,solarPV,newcapa,2050 -A2,0.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A2,1.58330000000,R1,2035,R1,power,solarPV,newcapa,2050 -A2,3.20830000000,R1,2040,R1,power,solarPV,newcapa,2050 -A2,8.15620000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,0.41670000000,R1,2035,R1,power,gasCCGT,newcapa,2050 +A1,0.12500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,0.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.90630000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,7.18750000000,R1,2025,R1,power,windturbine,newcapa,2050 +A2,0.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.56250000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,8.15620000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2050 A2,1.69390000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A2,5.17050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,7.09380000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,0.49430000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,7.08590000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,1.96350000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv index 917f816f5..60dd406ca 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -47,123 +47,123 @@ electricity,all-week,evening,all-year,8.69150000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,6.16680000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,8.67270000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,8.65200000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.31310000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.30790000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,8.67270000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,8.65200000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.31310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.30790000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,8.67270000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,8.65200000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.31310000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.30790000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,8.67270000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,8.65200000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.31310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.30790000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,8.67270000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,8.65200000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.31310000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.30790000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,8.67270000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,8.65200000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.31310000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.30790000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.15800000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.11830000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.08230000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.07350000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,11.15800000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,11.11830000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.08230000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.07350000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.15800000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.11830000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.08230000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.07350000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,11.15800000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,11.11830000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.08230000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.07350000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,11.15800000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.11830000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.08230000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.07350000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,11.15800000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,11.11830000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.08230000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.07350000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,12.24270000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,13.07010000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.46560000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.66260000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,12.24270000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,13.07010000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.46560000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.66260000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,12.24270000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,13.07010000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.46560000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.66260000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,12.24270000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,13.07010000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.46560000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.66260000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,12.24270000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,13.07010000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.46560000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.66260000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,12.24270000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,13.07010000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.46560000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.66260000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,12.28450000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,13.39510000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.28780000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,11.58400000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,12.28450000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.39510000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.28780000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,11.58400000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,12.28450000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,13.39510000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,11.28780000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,11.58400000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,12.28450000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.39510000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.28780000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,11.58400000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,12.28450000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,13.39510000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.28780000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.58400000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,12.28450000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.39510000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.28780000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,11.58400000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.60260000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,12.72560000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.97710000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,10.33070000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,11.60260000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.72560000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.97710000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.33070000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,11.60260000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,12.72560000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.97710000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,10.33070000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,11.60260000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.72560000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.97710000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.33070000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,11.60260000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,12.72560000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,9.97710000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,10.33070000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,11.60260000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,12.72560000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,9.97710000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.33070000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv index 91337e9b2..4a06dece5 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv @@ -21,16 +21,16 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,3.19440000000 1,2060,R1,gasCCGT,2025,3.19440000000 1,2064,R1,gasCCGT,2025,3.19440000000 -2,2030,R1,solarPV,2025,7.18750000000 -2,2035,R1,solarPV,2025,7.18750000000 -2,2040,R1,solarPV,2025,7.18750000000 -2,2045,R1,solarPV,2025,7.18750000000 -2,2049,R1,solarPV,2025,7.18750000000 -2,2050,R1,solarPV,2025,7.18750000000 -2,2054,R1,solarPV,2025,7.18750000000 -3,2025,R1,windturbine,2020,2.31250000000 -3,2030,R1,windturbine,2020,2.31250000000 -3,2035,R1,windturbine,2020,2.31250000000 -3,2040,R1,windturbine,2020,2.31250000000 -3,2045,R1,windturbine,2020,2.31250000000 -3,2049,R1,windturbine,2020,2.31250000000 +2,2025,R1,windturbine,2020,2.31250000000 +2,2030,R1,windturbine,2020,2.31250000000 +2,2035,R1,windturbine,2020,2.31250000000 +2,2040,R1,windturbine,2020,2.31250000000 +2,2045,R1,windturbine,2020,2.31250000000 +2,2049,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2025,7.18750000000 +3,2035,R1,windturbine,2025,7.18750000000 +3,2040,R1,windturbine,2025,7.18750000000 +3,2045,R1,windturbine,2025,7.18750000000 +3,2049,R1,windturbine,2025,7.18750000000 +3,2050,R1,windturbine,2025,7.18750000000 +3,2054,R1,windturbine,2025,7.18750000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv index 82b8c326c..765333420 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv @@ -21,24 +21,24 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,3.19440000000 1,2060,R1,gasCCGT,2025,3.19440000000 1,2064,R1,gasCCGT,2025,3.19440000000 -2,2030,R1,solarPV,2025,7.18750000000 -2,2035,R1,solarPV,2025,7.18750000000 -2,2040,R1,solarPV,2025,7.18750000000 -2,2045,R1,solarPV,2025,7.18750000000 -2,2049,R1,solarPV,2025,7.18750000000 -2,2050,R1,solarPV,2025,7.18750000000 -2,2054,R1,solarPV,2025,7.18750000000 -3,2035,R1,solarPV,2030,0.33330000000 -3,2040,R1,solarPV,2030,0.33330000000 -3,2045,R1,solarPV,2030,0.33330000000 -3,2049,R1,solarPV,2030,0.33330000000 -3,2050,R1,solarPV,2030,0.33330000000 -3,2054,R1,solarPV,2030,0.33330000000 -3,2055,R1,solarPV,2030,0.33330000000 -3,2059,R1,solarPV,2030,0.33330000000 -4,2025,R1,windturbine,2020,2.31250000000 -4,2030,R1,windturbine,2020,2.31250000000 -4,2035,R1,windturbine,2020,2.31250000000 -4,2040,R1,windturbine,2020,2.31250000000 -4,2045,R1,windturbine,2020,2.31250000000 -4,2049,R1,windturbine,2020,2.31250000000 +2,2025,R1,windturbine,2020,2.31250000000 +2,2030,R1,windturbine,2020,2.31250000000 +2,2035,R1,windturbine,2020,2.31250000000 +2,2040,R1,windturbine,2020,2.31250000000 +2,2045,R1,windturbine,2020,2.31250000000 +2,2049,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2025,7.18750000000 +3,2035,R1,windturbine,2025,7.18750000000 +3,2040,R1,windturbine,2025,7.18750000000 +3,2045,R1,windturbine,2025,7.18750000000 +3,2049,R1,windturbine,2025,7.18750000000 +3,2050,R1,windturbine,2025,7.18750000000 +3,2054,R1,windturbine,2025,7.18750000000 +4,2035,R1,windturbine,2030,0.37500000000 +4,2040,R1,windturbine,2030,0.37500000000 +4,2045,R1,windturbine,2030,0.37500000000 +4,2049,R1,windturbine,2030,0.37500000000 +4,2050,R1,windturbine,2030,0.37500000000 +4,2054,R1,windturbine,2030,0.37500000000 +4,2055,R1,windturbine,2030,0.37500000000 +4,2059,R1,windturbine,2030,0.37500000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv index 7eaa96be1..2e3c116e2 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv @@ -21,42 +21,44 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,3.19440000000 1,2060,R1,gasCCGT,2025,3.19440000000 1,2064,R1,gasCCGT,2025,3.19440000000 -2,2030,R1,solarPV,2025,7.18750000000 -2,2035,R1,solarPV,2025,7.18750000000 -2,2040,R1,solarPV,2025,7.18750000000 -2,2045,R1,solarPV,2025,7.18750000000 -2,2049,R1,solarPV,2025,7.18750000000 -2,2050,R1,solarPV,2025,7.18750000000 -2,2054,R1,solarPV,2025,7.18750000000 -3,2035,R1,solarPV,2030,0.33330000000 -3,2040,R1,solarPV,2030,0.33330000000 -3,2045,R1,solarPV,2030,0.33330000000 -3,2049,R1,solarPV,2030,0.33330000000 -3,2050,R1,solarPV,2030,0.33330000000 -3,2054,R1,solarPV,2030,0.33330000000 -3,2055,R1,solarPV,2030,0.33330000000 -3,2059,R1,solarPV,2030,0.33330000000 -4,2040,R1,solarPV,2035,2.00000000000 -4,2045,R1,solarPV,2035,2.00000000000 -4,2049,R1,solarPV,2035,2.00000000000 -4,2050,R1,solarPV,2035,2.00000000000 -4,2054,R1,solarPV,2035,2.00000000000 -4,2055,R1,solarPV,2035,2.00000000000 -4,2059,R1,solarPV,2035,2.00000000000 -4,2060,R1,solarPV,2035,2.00000000000 -4,2064,R1,solarPV,2035,2.00000000000 -5,2025,R1,windturbine,2020,2.31250000000 -5,2030,R1,windturbine,2020,2.31250000000 -5,2035,R1,windturbine,2020,2.31250000000 -5,2040,R1,windturbine,2020,2.31250000000 -5,2045,R1,windturbine,2020,2.31250000000 -5,2049,R1,windturbine,2020,2.31250000000 -6,2040,R1,windturbine,2035,0.75000000000 -6,2045,R1,windturbine,2035,0.75000000000 -6,2049,R1,windturbine,2035,0.75000000000 -6,2050,R1,windturbine,2035,0.75000000000 -6,2054,R1,windturbine,2035,0.75000000000 -6,2055,R1,windturbine,2035,0.75000000000 -6,2059,R1,windturbine,2035,0.75000000000 -6,2060,R1,windturbine,2035,0.75000000000 -6,2064,R1,windturbine,2035,0.75000000000 +2,2040,R1,gasCCGT,2035,0.41670000000 +2,2045,R1,gasCCGT,2035,0.41670000000 +2,2049,R1,gasCCGT,2035,0.41670000000 +2,2050,R1,gasCCGT,2035,0.41670000000 +2,2054,R1,gasCCGT,2035,0.41670000000 +2,2055,R1,gasCCGT,2035,0.41670000000 +2,2059,R1,gasCCGT,2035,0.41670000000 +2,2060,R1,gasCCGT,2035,0.41670000000 +2,2064,R1,gasCCGT,2035,0.41670000000 +2,2065,R1,gasCCGT,2035,0.41670000000 +2,2074,R1,gasCCGT,2035,0.41670000000 +3,2025,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2020,2.31250000000 +3,2035,R1,windturbine,2020,2.31250000000 +3,2040,R1,windturbine,2020,2.31250000000 +3,2045,R1,windturbine,2020,2.31250000000 +3,2049,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2025,7.18750000000 +4,2035,R1,windturbine,2025,7.18750000000 +4,2040,R1,windturbine,2025,7.18750000000 +4,2045,R1,windturbine,2025,7.18750000000 +4,2049,R1,windturbine,2025,7.18750000000 +4,2050,R1,windturbine,2025,7.18750000000 +4,2054,R1,windturbine,2025,7.18750000000 +5,2035,R1,windturbine,2030,0.37500000000 +5,2040,R1,windturbine,2030,0.37500000000 +5,2045,R1,windturbine,2030,0.37500000000 +5,2049,R1,windturbine,2030,0.37500000000 +5,2050,R1,windturbine,2030,0.37500000000 +5,2054,R1,windturbine,2030,0.37500000000 +5,2055,R1,windturbine,2030,0.37500000000 +5,2059,R1,windturbine,2030,0.37500000000 +6,2040,R1,windturbine,2035,2.18750000000 +6,2045,R1,windturbine,2035,2.18750000000 +6,2049,R1,windturbine,2035,2.18750000000 +6,2050,R1,windturbine,2035,2.18750000000 +6,2054,R1,windturbine,2035,2.18750000000 +6,2055,R1,windturbine,2035,2.18750000000 +6,2059,R1,windturbine,2035,2.18750000000 +6,2060,R1,windturbine,2035,2.18750000000 +6,2064,R1,windturbine,2035,2.18750000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv index 94ba0b038..cfec33754 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv @@ -21,62 +21,56 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,3.19440000000 1,2060,R1,gasCCGT,2025,3.19440000000 1,2064,R1,gasCCGT,2025,3.19440000000 -2,2030,R1,solarPV,2025,7.18750000000 -2,2035,R1,solarPV,2025,7.18750000000 -2,2040,R1,solarPV,2025,7.18750000000 -2,2045,R1,solarPV,2025,7.18750000000 -2,2049,R1,solarPV,2025,7.18750000000 -2,2050,R1,solarPV,2025,7.18750000000 -2,2054,R1,solarPV,2025,7.18750000000 -3,2035,R1,solarPV,2030,0.33330000000 -3,2040,R1,solarPV,2030,0.33330000000 -3,2045,R1,solarPV,2030,0.33330000000 -3,2049,R1,solarPV,2030,0.33330000000 -3,2050,R1,solarPV,2030,0.33330000000 -3,2054,R1,solarPV,2030,0.33330000000 -3,2055,R1,solarPV,2030,0.33330000000 -3,2059,R1,solarPV,2030,0.33330000000 -4,2040,R1,solarPV,2035,2.00000000000 -4,2045,R1,solarPV,2035,2.00000000000 -4,2049,R1,solarPV,2035,2.00000000000 -4,2050,R1,solarPV,2035,2.00000000000 -4,2054,R1,solarPV,2035,2.00000000000 -4,2055,R1,solarPV,2035,2.00000000000 -4,2059,R1,solarPV,2035,2.00000000000 -4,2060,R1,solarPV,2035,2.00000000000 -4,2064,R1,solarPV,2035,2.00000000000 -5,2045,R1,solarPV,2040,5.70830000000 -5,2049,R1,solarPV,2040,5.70830000000 -5,2050,R1,solarPV,2040,5.70830000000 -5,2054,R1,solarPV,2040,5.70830000000 -5,2055,R1,solarPV,2040,5.70830000000 -5,2059,R1,solarPV,2040,5.70830000000 -5,2060,R1,solarPV,2040,5.70830000000 -5,2064,R1,solarPV,2040,5.70830000000 -5,2065,R1,solarPV,2040,5.70830000000 -5,2069,R1,solarPV,2040,5.70830000000 -6,2025,R1,windturbine,2020,2.31250000000 -6,2030,R1,windturbine,2020,2.31250000000 -6,2035,R1,windturbine,2020,2.31250000000 -6,2040,R1,windturbine,2020,2.31250000000 -6,2045,R1,windturbine,2020,2.31250000000 -6,2049,R1,windturbine,2020,2.31250000000 -7,2040,R1,windturbine,2035,0.75000000000 -7,2045,R1,windturbine,2035,0.75000000000 -7,2049,R1,windturbine,2035,0.75000000000 -7,2050,R1,windturbine,2035,0.75000000000 -7,2054,R1,windturbine,2035,0.75000000000 -7,2055,R1,windturbine,2035,0.75000000000 -7,2059,R1,windturbine,2035,0.75000000000 -7,2060,R1,windturbine,2035,0.75000000000 -7,2064,R1,windturbine,2035,0.75000000000 -8,2045,R1,windturbine,2040,0.70830000000 -8,2049,R1,windturbine,2040,0.70830000000 -8,2050,R1,windturbine,2040,0.70830000000 -8,2054,R1,windturbine,2040,0.70830000000 -8,2055,R1,windturbine,2040,0.70830000000 -8,2059,R1,windturbine,2040,0.70830000000 -8,2060,R1,windturbine,2040,0.70830000000 -8,2064,R1,windturbine,2040,0.70830000000 -8,2065,R1,windturbine,2040,0.70830000000 -8,2069,R1,windturbine,2040,0.70830000000 +2,2040,R1,gasCCGT,2035,0.41670000000 +2,2045,R1,gasCCGT,2035,0.41670000000 +2,2049,R1,gasCCGT,2035,0.41670000000 +2,2050,R1,gasCCGT,2035,0.41670000000 +2,2054,R1,gasCCGT,2035,0.41670000000 +2,2055,R1,gasCCGT,2035,0.41670000000 +2,2059,R1,gasCCGT,2035,0.41670000000 +2,2060,R1,gasCCGT,2035,0.41670000000 +2,2064,R1,gasCCGT,2035,0.41670000000 +2,2065,R1,gasCCGT,2035,0.41670000000 +2,2069,R1,gasCCGT,2035,0.41670000000 +2,2070,R1,gasCCGT,2035,0.41670000000 +2,2074,R1,gasCCGT,2035,0.41670000000 +3,2025,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2020,2.31250000000 +3,2035,R1,windturbine,2020,2.31250000000 +3,2040,R1,windturbine,2020,2.31250000000 +3,2045,R1,windturbine,2020,2.31250000000 +3,2049,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2025,7.18750000000 +4,2035,R1,windturbine,2025,7.18750000000 +4,2040,R1,windturbine,2025,7.18750000000 +4,2045,R1,windturbine,2025,7.18750000000 +4,2049,R1,windturbine,2025,7.18750000000 +4,2050,R1,windturbine,2025,7.18750000000 +4,2054,R1,windturbine,2025,7.18750000000 +5,2035,R1,windturbine,2030,0.37500000000 +5,2040,R1,windturbine,2030,0.37500000000 +5,2045,R1,windturbine,2030,0.37500000000 +5,2049,R1,windturbine,2030,0.37500000000 +5,2050,R1,windturbine,2030,0.37500000000 +5,2054,R1,windturbine,2030,0.37500000000 +5,2055,R1,windturbine,2030,0.37500000000 +5,2059,R1,windturbine,2030,0.37500000000 +6,2040,R1,windturbine,2035,2.18750000000 +6,2045,R1,windturbine,2035,2.18750000000 +6,2049,R1,windturbine,2035,2.18750000000 +6,2050,R1,windturbine,2035,2.18750000000 +6,2054,R1,windturbine,2035,2.18750000000 +6,2055,R1,windturbine,2035,2.18750000000 +6,2059,R1,windturbine,2035,2.18750000000 +6,2060,R1,windturbine,2035,2.18750000000 +6,2064,R1,windturbine,2035,2.18750000000 +7,2045,R1,windturbine,2040,6.00000000000 +7,2049,R1,windturbine,2040,6.00000000000 +7,2050,R1,windturbine,2040,6.00000000000 +7,2054,R1,windturbine,2040,6.00000000000 +7,2055,R1,windturbine,2040,6.00000000000 +7,2059,R1,windturbine,2040,6.00000000000 +7,2060,R1,windturbine,2040,6.00000000000 +7,2064,R1,windturbine,2040,6.00000000000 +7,2065,R1,windturbine,2040,6.00000000000 +7,2069,R1,windturbine,2040,6.00000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv index de815ecc3..b9c470255 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv @@ -21,73 +21,67 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,3.19440000000 1,2060,R1,gasCCGT,2025,3.19440000000 1,2064,R1,gasCCGT,2025,3.19440000000 -2,2030,R1,solarPV,2025,7.18750000000 -2,2035,R1,solarPV,2025,7.18750000000 -2,2040,R1,solarPV,2025,7.18750000000 -2,2045,R1,solarPV,2025,7.18750000000 -2,2049,R1,solarPV,2025,7.18750000000 -2,2050,R1,solarPV,2025,7.18750000000 -2,2054,R1,solarPV,2025,7.18750000000 -3,2035,R1,solarPV,2030,0.33330000000 -3,2040,R1,solarPV,2030,0.33330000000 -3,2045,R1,solarPV,2030,0.33330000000 -3,2049,R1,solarPV,2030,0.33330000000 -3,2050,R1,solarPV,2030,0.33330000000 -3,2054,R1,solarPV,2030,0.33330000000 -3,2055,R1,solarPV,2030,0.33330000000 -3,2059,R1,solarPV,2030,0.33330000000 -4,2040,R1,solarPV,2035,2.00000000000 -4,2045,R1,solarPV,2035,2.00000000000 -4,2049,R1,solarPV,2035,2.00000000000 -4,2050,R1,solarPV,2035,2.00000000000 -4,2054,R1,solarPV,2035,2.00000000000 -4,2055,R1,solarPV,2035,2.00000000000 -4,2059,R1,solarPV,2035,2.00000000000 -4,2060,R1,solarPV,2035,2.00000000000 -4,2064,R1,solarPV,2035,2.00000000000 -5,2045,R1,solarPV,2040,5.70830000000 -5,2049,R1,solarPV,2040,5.70830000000 -5,2050,R1,solarPV,2040,5.70830000000 -5,2054,R1,solarPV,2040,5.70830000000 -5,2055,R1,solarPV,2040,5.70830000000 -5,2059,R1,solarPV,2040,5.70830000000 -5,2060,R1,solarPV,2040,5.70830000000 -5,2064,R1,solarPV,2040,5.70830000000 -5,2065,R1,solarPV,2040,5.70830000000 -5,2069,R1,solarPV,2040,5.70830000000 -6,2049,R1,solarPV,2045,2.32500000000 -6,2050,R1,solarPV,2045,11.06250000000 -6,2054,R1,solarPV,2045,11.06250000000 -6,2055,R1,solarPV,2045,11.06250000000 -6,2059,R1,solarPV,2045,11.06250000000 -6,2060,R1,solarPV,2045,11.06250000000 -6,2064,R1,solarPV,2045,11.06250000000 -6,2065,R1,solarPV,2045,11.06250000000 -6,2069,R1,solarPV,2045,11.06250000000 -6,2070,R1,solarPV,2045,11.06250000000 -6,2074,R1,solarPV,2045,11.06250000000 -7,2025,R1,windturbine,2020,2.31250000000 -7,2030,R1,windturbine,2020,2.31250000000 -7,2035,R1,windturbine,2020,2.31250000000 -7,2040,R1,windturbine,2020,2.31250000000 -7,2045,R1,windturbine,2020,2.31250000000 -7,2049,R1,windturbine,2020,2.31250000000 -8,2040,R1,windturbine,2035,0.75000000000 -8,2045,R1,windturbine,2035,0.75000000000 -8,2049,R1,windturbine,2035,0.75000000000 -8,2050,R1,windturbine,2035,0.75000000000 -8,2054,R1,windturbine,2035,0.75000000000 -8,2055,R1,windturbine,2035,0.75000000000 -8,2059,R1,windturbine,2035,0.75000000000 -8,2060,R1,windturbine,2035,0.75000000000 -8,2064,R1,windturbine,2035,0.75000000000 -9,2045,R1,windturbine,2040,0.70830000000 -9,2049,R1,windturbine,2040,0.70830000000 -9,2050,R1,windturbine,2040,0.70830000000 -9,2054,R1,windturbine,2040,0.70830000000 -9,2055,R1,windturbine,2040,0.70830000000 -9,2059,R1,windturbine,2040,0.70830000000 -9,2060,R1,windturbine,2040,0.70830000000 -9,2064,R1,windturbine,2040,0.70830000000 -9,2065,R1,windturbine,2040,0.70830000000 -9,2069,R1,windturbine,2040,0.70830000000 +2,2040,R1,gasCCGT,2035,0.41670000000 +2,2045,R1,gasCCGT,2035,0.41670000000 +2,2049,R1,gasCCGT,2035,0.41670000000 +2,2050,R1,gasCCGT,2035,0.41670000000 +2,2054,R1,gasCCGT,2035,0.41670000000 +2,2055,R1,gasCCGT,2035,0.41670000000 +2,2059,R1,gasCCGT,2035,0.41670000000 +2,2060,R1,gasCCGT,2035,0.41670000000 +2,2064,R1,gasCCGT,2035,0.41670000000 +2,2065,R1,gasCCGT,2035,0.41670000000 +2,2069,R1,gasCCGT,2035,0.41670000000 +2,2070,R1,gasCCGT,2035,0.41670000000 +2,2074,R1,gasCCGT,2035,0.41670000000 +3,2025,R1,windturbine,2020,2.31250000000 +3,2030,R1,windturbine,2020,2.31250000000 +3,2035,R1,windturbine,2020,2.31250000000 +3,2040,R1,windturbine,2020,2.31250000000 +3,2045,R1,windturbine,2020,2.31250000000 +3,2049,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2025,7.18750000000 +4,2035,R1,windturbine,2025,7.18750000000 +4,2040,R1,windturbine,2025,7.18750000000 +4,2045,R1,windturbine,2025,7.18750000000 +4,2049,R1,windturbine,2025,7.18750000000 +4,2050,R1,windturbine,2025,7.18750000000 +4,2054,R1,windturbine,2025,7.18750000000 +5,2035,R1,windturbine,2030,0.37500000000 +5,2040,R1,windturbine,2030,0.37500000000 +5,2045,R1,windturbine,2030,0.37500000000 +5,2049,R1,windturbine,2030,0.37500000000 +5,2050,R1,windturbine,2030,0.37500000000 +5,2054,R1,windturbine,2030,0.37500000000 +5,2055,R1,windturbine,2030,0.37500000000 +5,2059,R1,windturbine,2030,0.37500000000 +6,2040,R1,windturbine,2035,2.18750000000 +6,2045,R1,windturbine,2035,2.18750000000 +6,2049,R1,windturbine,2035,2.18750000000 +6,2050,R1,windturbine,2035,2.18750000000 +6,2054,R1,windturbine,2035,2.18750000000 +6,2055,R1,windturbine,2035,2.18750000000 +6,2059,R1,windturbine,2035,2.18750000000 +6,2060,R1,windturbine,2035,2.18750000000 +6,2064,R1,windturbine,2035,2.18750000000 +7,2045,R1,windturbine,2040,6.00000000000 +7,2049,R1,windturbine,2040,6.00000000000 +7,2050,R1,windturbine,2040,6.00000000000 +7,2054,R1,windturbine,2040,6.00000000000 +7,2055,R1,windturbine,2040,6.00000000000 +7,2059,R1,windturbine,2040,6.00000000000 +7,2060,R1,windturbine,2040,6.00000000000 +7,2064,R1,windturbine,2040,6.00000000000 +7,2065,R1,windturbine,2040,6.00000000000 +7,2069,R1,windturbine,2040,6.00000000000 +8,2049,R1,windturbine,2045,2.32500000000 +8,2050,R1,windturbine,2045,11.06250000000 +8,2054,R1,windturbine,2045,11.06250000000 +8,2055,R1,windturbine,2045,11.06250000000 +8,2059,R1,windturbine,2045,11.06250000000 +8,2060,R1,windturbine,2045,11.06250000000 +8,2064,R1,windturbine,2045,11.06250000000 +8,2065,R1,windturbine,2045,11.06250000000 +8,2069,R1,windturbine,2045,11.06250000000 +8,2070,R1,windturbine,2045,11.06250000000 +8,2074,R1,windturbine,2045,11.06250000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv index b24aa57cc..10258f7e7 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv @@ -21,106 +21,90 @@ asset,year,region,technology,installed,capacity 1,2059,R1,gasCCGT,2025,3.19440000000 1,2060,R1,gasCCGT,2025,3.19440000000 1,2064,R1,gasCCGT,2025,3.19440000000 -2,2055,R1,gasCCGT,2050,0.17820000000 -2,2059,R1,gasCCGT,2050,0.17820000000 -2,2060,R1,gasCCGT,2050,0.17820000000 -2,2064,R1,gasCCGT,2050,0.17820000000 -2,2065,R1,gasCCGT,2050,0.17820000000 -2,2069,R1,gasCCGT,2050,0.17820000000 -2,2070,R1,gasCCGT,2050,0.17820000000 -2,2074,R1,gasCCGT,2050,0.17820000000 -2,2075,R1,gasCCGT,2050,0.17820000000 -2,2079,R1,gasCCGT,2050,0.17820000000 -2,2080,R1,gasCCGT,2050,0.17820000000 -2,2089,R1,gasCCGT,2050,0.17820000000 -3,2030,R1,solarPV,2025,7.18750000000 -3,2035,R1,solarPV,2025,7.18750000000 -3,2040,R1,solarPV,2025,7.18750000000 -3,2045,R1,solarPV,2025,7.18750000000 -3,2049,R1,solarPV,2025,7.18750000000 -3,2050,R1,solarPV,2025,7.18750000000 -3,2054,R1,solarPV,2025,7.18750000000 -4,2035,R1,solarPV,2030,0.33330000000 -4,2040,R1,solarPV,2030,0.33330000000 -4,2045,R1,solarPV,2030,0.33330000000 -4,2049,R1,solarPV,2030,0.33330000000 -4,2050,R1,solarPV,2030,0.33330000000 -4,2054,R1,solarPV,2030,0.33330000000 -4,2055,R1,solarPV,2030,0.33330000000 -4,2059,R1,solarPV,2030,0.33330000000 -5,2040,R1,solarPV,2035,2.00000000000 -5,2045,R1,solarPV,2035,2.00000000000 -5,2049,R1,solarPV,2035,2.00000000000 -5,2050,R1,solarPV,2035,2.00000000000 -5,2054,R1,solarPV,2035,2.00000000000 -5,2055,R1,solarPV,2035,2.00000000000 -5,2059,R1,solarPV,2035,2.00000000000 -5,2060,R1,solarPV,2035,2.00000000000 -5,2064,R1,solarPV,2035,2.00000000000 -6,2045,R1,solarPV,2040,5.70830000000 -6,2049,R1,solarPV,2040,5.70830000000 -6,2050,R1,solarPV,2040,5.70830000000 -6,2054,R1,solarPV,2040,5.70830000000 -6,2055,R1,solarPV,2040,5.70830000000 -6,2059,R1,solarPV,2040,5.70830000000 -6,2060,R1,solarPV,2040,5.70830000000 -6,2064,R1,solarPV,2040,5.70830000000 -6,2065,R1,solarPV,2040,5.70830000000 -6,2069,R1,solarPV,2040,5.70830000000 -7,2049,R1,solarPV,2045,2.32500000000 -7,2050,R1,solarPV,2045,11.06250000000 -7,2054,R1,solarPV,2045,11.06250000000 -7,2055,R1,solarPV,2045,11.06250000000 -7,2059,R1,solarPV,2045,11.06250000000 -7,2060,R1,solarPV,2045,11.06250000000 -7,2064,R1,solarPV,2045,11.06250000000 -7,2065,R1,solarPV,2045,11.06250000000 -7,2069,R1,solarPV,2045,11.06250000000 -7,2070,R1,solarPV,2045,11.06250000000 -7,2074,R1,solarPV,2045,11.06250000000 -8,2054,R1,solarPV,2050,4.60000000000 -8,2055,R1,solarPV,2050,15.75000000000 -8,2059,R1,solarPV,2050,15.75000000000 -8,2060,R1,solarPV,2050,15.75000000000 -8,2064,R1,solarPV,2050,15.75000000000 -8,2065,R1,solarPV,2050,15.75000000000 -8,2069,R1,solarPV,2050,15.75000000000 -8,2070,R1,solarPV,2050,15.75000000000 -8,2074,R1,solarPV,2050,15.75000000000 -8,2075,R1,solarPV,2050,15.75000000000 -8,2079,R1,solarPV,2050,15.75000000000 -9,2025,R1,windturbine,2020,2.31250000000 -9,2030,R1,windturbine,2020,2.31250000000 -9,2035,R1,windturbine,2020,2.31250000000 -9,2040,R1,windturbine,2020,2.31250000000 -9,2045,R1,windturbine,2020,2.31250000000 -9,2049,R1,windturbine,2020,2.31250000000 -10,2040,R1,windturbine,2035,0.75000000000 -10,2045,R1,windturbine,2035,0.75000000000 -10,2049,R1,windturbine,2035,0.75000000000 -10,2050,R1,windturbine,2035,0.75000000000 -10,2054,R1,windturbine,2035,0.75000000000 -10,2055,R1,windturbine,2035,0.75000000000 -10,2059,R1,windturbine,2035,0.75000000000 -10,2060,R1,windturbine,2035,0.75000000000 -10,2064,R1,windturbine,2035,0.75000000000 -11,2045,R1,windturbine,2040,0.70830000000 -11,2049,R1,windturbine,2040,0.70830000000 -11,2050,R1,windturbine,2040,0.70830000000 -11,2054,R1,windturbine,2040,0.70830000000 -11,2055,R1,windturbine,2040,0.70830000000 -11,2059,R1,windturbine,2040,0.70830000000 -11,2060,R1,windturbine,2040,0.70830000000 -11,2064,R1,windturbine,2040,0.70830000000 -11,2065,R1,windturbine,2040,0.70830000000 -11,2069,R1,windturbine,2040,0.70830000000 -12,2055,R1,windturbine,2050,10.00000000000 -12,2059,R1,windturbine,2050,10.00000000000 -12,2060,R1,windturbine,2050,10.00000000000 -12,2064,R1,windturbine,2050,10.00000000000 -12,2065,R1,windturbine,2050,10.00000000000 -12,2069,R1,windturbine,2050,10.00000000000 -12,2070,R1,windturbine,2050,10.00000000000 -12,2074,R1,windturbine,2050,10.00000000000 -12,2075,R1,windturbine,2050,10.00000000000 -12,2079,R1,windturbine,2050,10.00000000000 +2,2040,R1,gasCCGT,2035,0.41670000000 +2,2045,R1,gasCCGT,2035,0.41670000000 +2,2049,R1,gasCCGT,2035,0.41670000000 +2,2050,R1,gasCCGT,2035,0.41670000000 +2,2054,R1,gasCCGT,2035,0.41670000000 +2,2055,R1,gasCCGT,2035,0.41670000000 +2,2059,R1,gasCCGT,2035,0.41670000000 +2,2060,R1,gasCCGT,2035,0.41670000000 +2,2064,R1,gasCCGT,2035,0.41670000000 +2,2065,R1,gasCCGT,2035,0.41670000000 +2,2069,R1,gasCCGT,2035,0.41670000000 +2,2070,R1,gasCCGT,2035,0.41670000000 +2,2074,R1,gasCCGT,2035,0.41670000000 +3,2055,R1,gasCCGT,2050,4.67360000000 +3,2059,R1,gasCCGT,2050,4.67360000000 +3,2060,R1,gasCCGT,2050,4.67360000000 +3,2064,R1,gasCCGT,2050,4.67360000000 +3,2065,R1,gasCCGT,2050,4.67360000000 +3,2069,R1,gasCCGT,2050,4.67360000000 +3,2070,R1,gasCCGT,2050,4.67360000000 +3,2074,R1,gasCCGT,2050,4.67360000000 +3,2075,R1,gasCCGT,2050,4.67360000000 +3,2079,R1,gasCCGT,2050,4.67360000000 +3,2080,R1,gasCCGT,2050,4.67360000000 +3,2089,R1,gasCCGT,2050,4.67360000000 +4,2025,R1,windturbine,2020,2.31250000000 +4,2030,R1,windturbine,2020,2.31250000000 +4,2035,R1,windturbine,2020,2.31250000000 +4,2040,R1,windturbine,2020,2.31250000000 +4,2045,R1,windturbine,2020,2.31250000000 +4,2049,R1,windturbine,2020,2.31250000000 +5,2030,R1,windturbine,2025,7.18750000000 +5,2035,R1,windturbine,2025,7.18750000000 +5,2040,R1,windturbine,2025,7.18750000000 +5,2045,R1,windturbine,2025,7.18750000000 +5,2049,R1,windturbine,2025,7.18750000000 +5,2050,R1,windturbine,2025,7.18750000000 +5,2054,R1,windturbine,2025,7.18750000000 +6,2035,R1,windturbine,2030,0.37500000000 +6,2040,R1,windturbine,2030,0.37500000000 +6,2045,R1,windturbine,2030,0.37500000000 +6,2049,R1,windturbine,2030,0.37500000000 +6,2050,R1,windturbine,2030,0.37500000000 +6,2054,R1,windturbine,2030,0.37500000000 +6,2055,R1,windturbine,2030,0.37500000000 +6,2059,R1,windturbine,2030,0.37500000000 +7,2040,R1,windturbine,2035,2.18750000000 +7,2045,R1,windturbine,2035,2.18750000000 +7,2049,R1,windturbine,2035,2.18750000000 +7,2050,R1,windturbine,2035,2.18750000000 +7,2054,R1,windturbine,2035,2.18750000000 +7,2055,R1,windturbine,2035,2.18750000000 +7,2059,R1,windturbine,2035,2.18750000000 +7,2060,R1,windturbine,2035,2.18750000000 +7,2064,R1,windturbine,2035,2.18750000000 +8,2045,R1,windturbine,2040,6.00000000000 +8,2049,R1,windturbine,2040,6.00000000000 +8,2050,R1,windturbine,2040,6.00000000000 +8,2054,R1,windturbine,2040,6.00000000000 +8,2055,R1,windturbine,2040,6.00000000000 +8,2059,R1,windturbine,2040,6.00000000000 +8,2060,R1,windturbine,2040,6.00000000000 +8,2064,R1,windturbine,2040,6.00000000000 +8,2065,R1,windturbine,2040,6.00000000000 +8,2069,R1,windturbine,2040,6.00000000000 +9,2049,R1,windturbine,2045,2.32500000000 +9,2050,R1,windturbine,2045,11.06250000000 +9,2054,R1,windturbine,2045,11.06250000000 +9,2055,R1,windturbine,2045,11.06250000000 +9,2059,R1,windturbine,2045,11.06250000000 +9,2060,R1,windturbine,2045,11.06250000000 +9,2064,R1,windturbine,2045,11.06250000000 +9,2065,R1,windturbine,2045,11.06250000000 +9,2069,R1,windturbine,2045,11.06250000000 +9,2070,R1,windturbine,2045,11.06250000000 +9,2074,R1,windturbine,2045,11.06250000000 +10,2054,R1,windturbine,2050,4.60000000000 +10,2055,R1,windturbine,2050,15.75000000000 +10,2059,R1,windturbine,2050,15.75000000000 +10,2060,R1,windturbine,2050,15.75000000000 +10,2064,R1,windturbine,2050,15.75000000000 +10,2065,R1,windturbine,2050,15.75000000000 +10,2069,R1,windturbine,2050,15.75000000000 +10,2070,R1,windturbine,2050,15.75000000000 +10,2074,R1,windturbine,2050,15.75000000000 +10,2075,R1,windturbine,2050,15.75000000000 +10,2079,R1,windturbine,2050,15.75000000000 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv index 38c886d3c..7218c1fcb 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv @@ -1,21 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Exports,2010,0,0,0,0,0,0 -R1,Exports,2015,0,0,0,0,0,0 -R1,Exports,2020,0,0,0,0,0,0 -R1,Exports,2025,0,0,0,0,0,0 -R1,Exports,2030,0,0,0,0,0,0 -R1,Exports,2035,0,0,0,0,0,0 -R1,Exports,2040,0,0,0,0,0,0 -R1,Exports,2045,0,0,0,0,0,0 -R1,Exports,2050,0,0,0,0,0,0 -R1,Exports,2055,0,0,0,0,0,0 -R1,Exports,2060,0,0,0,0,0,0 -R1,Exports,2065,0,0,0,0,0,0 -R1,Exports,2070,0,0,0,0,0,0 -R1,Exports,2075,0,0,0,0,0,0 -R1,Exports,2080,0,0,0,0,0,0 -R1,Exports,2085,0,0,0,0,0,0 -R1,Exports,2090,0,0,0,0,0,0 -R1,Exports,2095,0,0,0,0,0,0 -R1,Exports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Exports,2010,0,0,0,0,0 +R1,Exports,2015,0,0,0,0,0 +R1,Exports,2020,0,0,0,0,0 +R1,Exports,2025,0,0,0,0,0 +R1,Exports,2030,0,0,0,0,0 +R1,Exports,2035,0,0,0,0,0 +R1,Exports,2040,0,0,0,0,0 +R1,Exports,2045,0,0,0,0,0 +R1,Exports,2050,0,0,0,0,0 +R1,Exports,2055,0,0,0,0,0 +R1,Exports,2060,0,0,0,0,0 +R1,Exports,2065,0,0,0,0,0 +R1,Exports,2070,0,0,0,0,0 +R1,Exports,2075,0,0,0,0,0 +R1,Exports,2080,0,0,0,0,0 +R1,Exports,2085,0,0,0,0,0 +R1,Exports,2090,0,0,0,0,0 +R1,Exports,2095,0,0,0,0,0 +R1,Exports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv index 9c9cc695f..75b322762 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv @@ -1,21 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ -R1,Imports,2010,0,0,0,0,0,0 -R1,Imports,2015,0,0,0,0,0,0 -R1,Imports,2020,0,0,0,0,0,0 -R1,Imports,2025,0,0,0,0,0,0 -R1,Imports,2030,0,0,0,0,0,0 -R1,Imports,2035,0,0,0,0,0,0 -R1,Imports,2040,0,0,0,0,0,0 -R1,Imports,2045,0,0,0,0,0,0 -R1,Imports,2050,0,0,0,0,0,0 -R1,Imports,2055,0,0,0,0,0,0 -R1,Imports,2060,0,0,0,0,0,0 -R1,Imports,2065,0,0,0,0,0,0 -R1,Imports,2070,0,0,0,0,0,0 -R1,Imports,2075,0,0,0,0,0,0 -R1,Imports,2080,0,0,0,0,0,0 -R1,Imports,2085,0,0,0,0,0,0 -R1,Imports,2090,0,0,0,0,0,0 -R1,Imports,2095,0,0,0,0,0,0 -R1,Imports,2100,0,0,0,0,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ,PJ,PJ,kt,PJ +R1,Imports,2010,0,0,0,0,0 +R1,Imports,2015,0,0,0,0,0 +R1,Imports,2020,0,0,0,0,0 +R1,Imports,2025,0,0,0,0,0 +R1,Imports,2030,0,0,0,0,0 +R1,Imports,2035,0,0,0,0,0 +R1,Imports,2040,0,0,0,0,0 +R1,Imports,2045,0,0,0,0,0 +R1,Imports,2050,0,0,0,0,0 +R1,Imports,2055,0,0,0,0,0 +R1,Imports,2060,0,0,0,0,0 +R1,Imports,2065,0,0,0,0,0 +R1,Imports,2070,0,0,0,0,0 +R1,Imports,2075,0,0,0,0,0 +R1,Imports,2080,0,0,0,0,0 +R1,Imports,2085,0,0,0,0,0 +R1,Imports,2090,0,0,0,0,0 +R1,Imports,2095,0,0,0,0,0 +R1,Imports,2100,0,0,0,0,0 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv index 9691db73d..0d4c58da7 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv @@ -1,7 +1,6 @@ Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit -Electricity,Energy,electricity,0.0,1,PJ +Electricity,Energy,electricity,0,1,PJ Gas,Energy,gas,56.1,1,PJ -Heat,Energy,heat,0.0,1,PJ -Wind,Energy,wind,0.0,1,PJ -CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt -Solar,Energy,solar,0.0,1,PJ +Heat,Energy,heat,0,1,PJ +Wind,Energy,wind,0,1,PJ +CO2fuelcomsbustion,Environmental,CO2f,0,1,kt diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv index 6a013889f..5b5e43261 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv @@ -1,21 +1,21 @@ -RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt -R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0 -R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0 -R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0 -R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0 -R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0 -R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0 -R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0 -R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0 -R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0 -R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0 -R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0 -R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0 -R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0 -R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0 -R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0 -R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0 -R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0 -R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0 -R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0 +RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt +R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0 +R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0 +R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0 +R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0 +R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0 +R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0 +R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0 +R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0 +R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0 +R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0 +R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0 +R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0 +R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0 +R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0 +R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0 +R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0 +R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0 +R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0 +R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml index b297589a1..29306d1c9 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml @@ -6,7 +6,7 @@ regions = ["R1"] interest_rate = 0.1 interpolation_mode = 'Active' log_level = 'info' -excluded_commodities = ["wind", "solar"] +excluded_commodities = ["wind"] # Convergence parameters equilibrium_variable = 'demand' maximum_iterations = 100 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv index 7fe44c8a1..c78f9c6e1 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv @@ -1,8 +1,4 @@ -ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0 -gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0 -windturbine,R1,2020,fixed,0,0,0,0,1,0 -windturbine,R1,2040,fixed,0,0,0,0,1,0 -solarPV,R1,2020,fixed,0,0,0,0,0,1 -solarPV,R1,2040,fixed,0,0,0,0,0,1 +ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind +Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,fixed,0,1.67,0,0,0 +windturbine,R1,2020,fixed,0,0,0,0,1 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv index 4659a4b1e..efaac0580 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv @@ -1,8 +1,4 @@ -ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar -Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ -gasCCGT,R1,2020,1,0,0,91.67,0,0 -gasCCGT,R1,2040,1,0,0,91.67,0,0 -windturbine,R1,2020,1,0,0,0,0,0 -windturbine,R1,2040,1,0,0,0,0,0 -solarPV,R1,2020,1,0,0,0,0,0 -solarPV,R1,2040,1,0,0,0,0,0 +ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind +Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ +gasCCGT,R1,2020,1,0,0,91.67,0 +windturbine,R1,2020,1,0,0,0,0 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv index 56b7b1fcc..2171d259c 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv @@ -1,4 +1,3 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0 windturbine,R1,PJ/y,0,0,0,0,0,0,0 -solarPV,R1,PJ/y,0,0,0,0,0,0,0 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv index 32b439391..7489bc368 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv @@ -1,8 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5 -gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5 windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5 -windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5 -solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5 -solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv index 614627f27..06d71ed68 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv @@ -1,7 +1,7 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,1.0,0,0,0 -R1,2,0,0,1.5,0,0,0 -R1,3,0,0,1.0,0,0,0 -R1,4,0,0,1.5,0,0,0 -R1,5,0,0,3.0,0,0,0 -R1,6,0,0,2.0,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,1,0,0 +R1,2,0,0,1.5,0,0 +R1,3,0,0,1,0,0 +R1,4,0,0,1.5,0,0 +R1,5,0,0,3,0,0 +R1,6,0,0,2,0,0 diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv index c0bc70ac6..e6d7e03cc 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv @@ -1,7 +1,7 @@ -RegionName,Timeslice,electricity,gas,heat,CO2f,wind,solar -R1,1,0,0,3.0,0,0,0 -R1,2,0,0,4.5,0,0,0 -R1,3,0,0,3.0,0,0,0 -R1,4,0,0,4.5,0,0,0 -R1,5,0,0,9.0,0,0,0 -R1,6,0,0,6.0,0,0,0 +RegionName,Timeslice,electricity,gas,heat,CO2f,wind +R1,1,0,0,3,0,0 +R1,2,0,0,4.5,0,0 +R1,3,0,0,3,0,0 +R1,4,0,0,4.5,0,0 +R1,5,0,0,9,0,0 +R1,6,0,0,6,0,0 diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py index 184eae27c..41584e8e5 100644 --- a/docs/tutorial-code/2-add-agent/generate_models.py +++ b/docs/tutorial-code/2-add-agent/generate_models.py @@ -1,7 +1,9 @@ +import os import shutil from pathlib import Path import pandas as pd +from muse import examples from muse.wizard import add_agent, get_sectors parent_path = Path(__file__).parent @@ -18,10 +20,9 @@ def generate_model_1(): if model_path.exists(): shutil.rmtree(model_path) - # Starting point: copy model from previous tutorial - shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path) - if (model_path / "Results").exists(): - shutil.rmtree(model_path / "Results") + # Starting point: copy default model + examples.copy_model(name="default", path=parent_path, overwrite=True) + os.rename(parent_path / "model", model_path) # Copy agent A1 -> A2 add_agent( diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb index 61ce267c5..95c07a4cc 100644 --- a/docs/user-guide/add-agent.ipynb +++ b/docs/user-guide/add-agent.ipynb @@ -11,7 +11,15 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "In this section, we will add a new agent. We will continue to use the files from the previous tutorial where we added `solarPV` and created a new scenario. Compared to the original agent, which bases investment decisions on minimising [LCOE](https://en.wikipedia.org/wiki/Levelized_cost_of_electricity), the second agent will aim to minimise fuel consumption costs.\n", + "This tutorial will show how we can add additional agents to the model, and modify the objectives of these agents. \n", + "\n", + "Again, we will build off the default model that comes with MUSE. To copy the files for this model, run:\n", + "\n", + "```bash\n", + "python -m muse --model default --copy PATH/TO/COPY/THE/MODEL/TO\n", + "```\n", + "\n", + "We will begin by adding a second agent to this model. Compared to the current agent, which bases investment decisions on minimising [LCOE](https://en.wikipedia.org/wiki/Levelized_cost_of_electricity), the second agent will aim to minimise fuel consumption costs.\n", "\n", "To achieve this, first, we must modify the ```Agents.csv``` file in the directory:\n", "\n", @@ -178,7 +186,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "In this scenario we can see that agent `A2` has an intermediate behaviour compared to the two agents in the first simulation, investing in both gas boilers and heat pumps throughout the length of the simulation.\n", + "In this scenario we can see that agent `A2` has an intermediate behaviour compared to the two agents in the first simulation, investing in both gas boilers and heat pumps.\n", "\n", "From this small scenario, the difference between investment strategies between agents is evident. This is one of the key benefits of agent-based models when compared to optimisation-based models.\n", "\n", diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb index 290836f32..b99c49674 100644 --- a/docs/user-guide/add-region.ipynb +++ b/docs/user-guide/add-region.ipynb @@ -13,7 +13,7 @@ "source": [ "The next step is to add a region which we will call `R2`, however, this could equally be called `USA` or `India`. This requires us to undertake a similar process as before of modifying the input simulation data.\n", "\n", - "This tutorial will follow on from the model in tutorial 1 (including the price change in 2040, but before adding the second agent in tutorial 2). To begin, copy your files from tutorial 1 to a new location.\n", + "This tutorial will follow on from the model in tutorial 1 (including the price change in 2040). To begin, copy your files from tutorial 1 to a new location.\n", "\n", "To add a new region, we begin by modifying the ```settings.toml``` file. We just have to add our new region to the ```regions``` variable, in the 4th line of the file, like so:\n", "\n", diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb index 53bb6a18d..d44a5712e 100644 --- a/docs/user-guide/add-solar.ipynb +++ b/docs/user-guide/add-solar.ipynb @@ -483,7 +483,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Please save a copy of the current model (with the changing costs in 2040), as we will be building on it directly in tutorials 2 and 3.\n", + "Please save a copy of the current model (with the changing costs in 2040), as we will be building on it directly in tutorial 3.\n", "\n", "In the next tutorial we will add a new agent to the simulation. " ]