Skip to content

Fix timeslice-related bugs #518

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
tsmbland merged 21 commits into from
Oct 25, 2024
Merged

Fix timeslice-related bugs #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7defafb
Fix use of UF and MSF in constraints
tsmbland Oct 9, 2024
b332cd9
Fix a few more UF/MSF occurences
tsmbland Oct 9, 2024
2ebb8a3
Bump version
tsmbland Oct 9, 2024
a61a036
Fix max_production function
tsmbland Oct 16, 2024
b7eb0de
FIx timeslice reader
tsmbland Oct 16, 2024
cd630fe
Update results files
tsmbland Oct 16, 2024
8f2d7fe
Update example results
tsmbland Oct 16, 2024
6340ab0
Merge branch 'dispatch_production' into fix_supply_issue
tsmbland Oct 17, 2024
333f147
Fix minimum_production function
tsmbland Oct 17, 2024
268877a
Update results files
tsmbland Oct 17, 2024
8708956
Merge branch 'dispatch_production' into fix_supply_issue
tsmbland Oct 18, 2024
98d1bd3
Update results files
tsmbland Oct 18, 2024
4bcb467
Merge branch 'fix_supply_issue' of https://github.com/EnergySystemsMo…
tsmbland Oct 18, 2024
c7f49dd
Remove redundant convert_timeslice calls from tests
tsmbland Oct 18, 2024
51bc7a9
Fix some tests
tsmbland Oct 18, 2024
4f057a4
Fix some more tests
tsmbland Oct 18, 2024
dcc14e9
Fix error in unmet_forecasted_demand
tsmbland Oct 18, 2024
9030be1
Fix remaining tests
tsmbland Oct 18, 2024
8e8b5bf
Update tutorial
tsmbland Oct 18, 2024
b17a9b7
Use local timesliced objects rather than TIMESLICE
tsmbland Oct 25, 2024
3407cfe
Fix doctest
tsmbland Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.2.1
current_version = 1.2.2rc1
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ authors:
given-names: Adam

title: MUSE_OS
version: v1.2.1
version: v1.2.2rc1
date-released: 2024-08-13
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
project = "MUSE"
copyright = "2024, Imperial College London"
author = "Imperial College London"
release = "1.2.1"
release = "1.2.2rc1"
version = ".".join(release.split(".")[:2])

# -- General configuration ---------------------------------------------------
Expand Down
84 changes: 42 additions & 42 deletions docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ 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,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.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025
A2,9.17600000000,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
Expand All @@ -21,10 +21,10 @@ A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030
A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2030
A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030
A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030
A1,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030
A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2030
A2,5.98230000000,R1,2020,R1,gas,gassupply1,newcapa,2030
A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2030
A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030
A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030
A2,7.02400000000,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,gasboiler,newcapa,2035
Expand All @@ -35,12 +35,12 @@ A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2035
A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035
A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035
A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035
A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035
A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2035
A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2035
A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2035
A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2035
A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2035
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035
A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035
A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035
A2,5.68330000000,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
Expand All @@ -53,14 +53,14 @@ A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040
A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040
A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040
A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040
A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040
A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2040
A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A1,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2040
A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2040
A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2040
A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A2,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2040
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040
A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040
A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040
A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A2,2.90000000000,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
Expand All @@ -75,16 +75,16 @@ A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045
A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045
A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045
A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2045
A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A1,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2045
A1,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2045
A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2045
A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2045
A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A2,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2045
A2,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2045
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045
A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045
A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045
A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045
A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045
A2,0.48330000000,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
Expand All @@ -100,15 +100,15 @@ A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050
A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
A2,3.15630000000,R1,2045,R1,power,windturbine,newcapa,2050
A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050
A1,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2050
A1,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A1,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2050
A1,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2050
A1,1.91720000000,R1,2045,R1,gas,gassupply1,newcapa,2050
A2,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050
A2,6.46770000000,R1,2025,R1,gas,gassupply1,newcapa,2050
A2,6.00700000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A2,0.91190000000,R1,2035,R1,gas,gassupply1,newcapa,2050
A2,1.86430000000,R1,2040,R1,gas,gassupply1,newcapa,2050
A2,1.91720000000,R1,2045,R1,gas,gassupply1,newcapa,2050
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050
A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050
A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050
A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
A1,1.45000000000,R1,2045,R1,gas,gassupply1,newcapa,2050
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050
A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050
A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050
A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
A2,1.45000000000,R1,2045,R1,gas,gassupply1,newcapa,2050
78 changes: 38 additions & 40 deletions docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ 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,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.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025
A2,9.17600000000,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
Expand All @@ -21,10 +21,10 @@ A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030
A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030
A2,8.43750000000,R1,2025,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.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030
A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2030
A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030
A2,4.50010000000,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
Expand All @@ -36,12 +36,12 @@ A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2035
A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035
A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2035
A2,1.02500000000,R1,2030,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.41680000000,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.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2035
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035
A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2035
A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2035
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035
A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2035
A2,4.97440000000,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
Expand All @@ -56,14 +56,14 @@ A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040
A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2040
A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2040
A2,2.78130000000,R1,2035,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.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A1,0.03060000000,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.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A2,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2040
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040
A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2040
A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A1,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2040
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040
A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2040
A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2040
A2,0.12180000000,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
Expand All @@ -78,15 +78,15 @@ A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045
A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2045
A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2045
A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2045
A2,5.85000000000,R1,2040,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.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A1,0.03060000000,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.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A2,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2045
A2,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2045
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045
A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2045
A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A1,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2045
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045
A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2045
A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2045
A2,0.12180000000,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
Expand All @@ -97,17 +97,15 @@ A1,0.09720000000,R1,2035,R1,power,gasCCGT,newcapa,2050
A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2050
A1,2.56250000000,R1,2035,R1,power,windturbine,newcapa,2050
A1,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2050
A1,0.90630000000,R1,2045,R1,power,windturbine,newcapa,2050
A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2050
A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2050
A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2050
A2,5.85000000000,R1,2040,R1,power,windturbine,newcapa,2050
A2,3.90630000000,R1,2045,R1,power,windturbine,newcapa,2050
A1,2.23230000000,R1,2020,R1,gas,gassupply1,newcapa,2050
A1,3.94380000000,R1,2025,R1,gas,gassupply1,newcapa,2050
A1,5.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A1,0.03060000000,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.41680000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A2,0.03060000000,R1,2035,R1,gas,gassupply1,newcapa,2050
A2,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2050
A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050
A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2050
A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A1,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2050
A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050
A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2050
A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2050
A2,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2050
48 changes: 24 additions & 24 deletions docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,51 +119,51 @@ electricity,all-week,evening,all-year,10.99080000000,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.34560000000,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,8.65130000000,R1,0,MUS$2010/PJ,2045
electricity,all-week,night,all-year,7.57960000000,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,3.70100000000,R1,0,MUS$2010/PJ,2045
heat,all-week,night,all-year,3.27230000000,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,8.65130000000,R1,1,MUS$2010/PJ,2045
electricity,all-week,morning,all-year,7.57960000000,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,3.70100000000,R1,1,MUS$2010/PJ,2045
heat,all-week,morning,all-year,3.27230000000,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,8.65130000000,R1,2,MUS$2010/PJ,2045
electricity,all-week,afternoon,all-year,7.57960000000,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,3.70100000000,R1,2,MUS$2010/PJ,2045
heat,all-week,afternoon,all-year,3.27230000000,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,8.65130000000,R1,3,MUS$2010/PJ,2045
electricity,all-week,early-peak,all-year,7.57960000000,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,3.70100000000,R1,3,MUS$2010/PJ,2045
heat,all-week,early-peak,all-year,3.27230000000,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,8.65130000000,R1,4,MUS$2010/PJ,2045
electricity,all-week,late-peak,all-year,7.57960000000,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,3.70100000000,R1,4,MUS$2010/PJ,2045
heat,all-week,late-peak,all-year,3.27230000000,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,8.65130000000,R1,5,MUS$2010/PJ,2045
electricity,all-week,evening,all-year,7.57960000000,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,3.70100000000,R1,5,MUS$2010/PJ,2045
heat,all-week,evening,all-year,3.27230000000,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.76820000000,R1,0,MUS$2010/PJ,2050
electricity,all-week,night,all-year,9.19440000000,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.14780000000,R1,0,MUS$2010/PJ,2050
heat,all-week,night,all-year,3.91830000000,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.76820000000,R1,1,MUS$2010/PJ,2050
electricity,all-week,morning,all-year,9.19440000000,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.14780000000,R1,1,MUS$2010/PJ,2050
heat,all-week,morning,all-year,3.91830000000,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.76820000000,R1,2,MUS$2010/PJ,2050
electricity,all-week,afternoon,all-year,9.19440000000,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.14780000000,R1,2,MUS$2010/PJ,2050
heat,all-week,afternoon,all-year,3.91830000000,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.76820000000,R1,3,MUS$2010/PJ,2050
electricity,all-week,early-peak,all-year,9.19440000000,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.14780000000,R1,3,MUS$2010/PJ,2050
heat,all-week,early-peak,all-year,3.91830000000,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.76820000000,R1,4,MUS$2010/PJ,2050
electricity,all-week,late-peak,all-year,9.19440000000,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.14780000000,R1,4,MUS$2010/PJ,2050
heat,all-week,late-peak,all-year,3.91830000000,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.76820000000,R1,5,MUS$2010/PJ,2050
electricity,all-week,evening,all-year,9.19440000000,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.14780000000,R1,5,MUS$2010/PJ,2050
heat,all-week,evening,all-year,3.91830000000,R1,5,MUS$2010/PJ,2050
CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
Loading