Skip to content

v1.2.2 #535

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 50 commits into from
Oct 28, 2024
Merged

v1.2.2 #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
bd875ac
Add minimum_production quantity
dalonsoa Jun 21, 2024
be438a2
Use min_production in the supply calculation
dalonsoa Jun 21, 2024
902e8a0
Update defautl_timeslice example
dalonsoa Jun 21, 2024
70ae3d5
Update minimum_service example
dalonsoa Jun 21, 2024
e20473d
Update docs\tutorial-code\7-min-max-timeslice-constraints\2-max-const…
dalonsoa Jun 21, 2024
64d148f
update docs\tutorial-code\7-min-max-timeslice-constraints\1-min-const…
dalonsoa Jun 21, 2024
25de8cf
Add test_min_production
dalonsoa Jun 21, 2024
964f676
Add test_supply_capped_by_min_service
dalonsoa Jun 21, 2024
e3d028d
Add test supply limitted by service factor
dalonsoa Jun 24, 2024
b6425f2
Remove unnecessary check
dalonsoa Jun 24, 2024
7b522aa
Update output data
dalonsoa Jun 24, 2024
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
38e3021
Merge branch 'develop' into min_production
tsmbland Oct 17, 2024
94ccbc2
Merge branch 'v1.3' into min_production
tsmbland Oct 17, 2024
537b4bd
Fix error in supply calculation
tsmbland Oct 17, 2024
774092d
Use dispatch_production=share in example models
tsmbland Oct 17, 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
38dd121
Update notebook
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
208e994
Merge pull request #368 from EnergySystemsModellingLab/min_production
tsmbland Oct 18, 2024
a3e158e
Merge pull request #521 from EnergySystemsModellingLab/dispatch_produ…
tsmbland Oct 18, 2024
c62d437
Fixes related to calculation of costs
tsmbland Oct 24, 2024
81c6e9b
Update tutorial results
tsmbland Oct 24, 2024
bc2d628
Fix test
tsmbland Oct 24, 2024
d7d47d6
Update results files
tsmbland Oct 24, 2024
b17a9b7
Use local timesliced objects rather than TIMESLICE
tsmbland Oct 25, 2024
3407cfe
Fix doctest
tsmbland Oct 25, 2024
0eea1ca
Merge pull request #518 from EnergySystemsModellingLab/fix_supply_issue
tsmbland Oct 25, 2024
2acef46
Merge branch 'v1.2.2' into broadcast_errors2
tsmbland Oct 25, 2024
c84e465
Merge branch 'main' into v1.2.2
tsmbland Oct 25, 2024
2a51814
Merge branch 'v1.2.2' into broadcast_errors2
tsmbland Oct 25, 2024
21922c2
Add inline comments
tsmbland Oct 25, 2024
be29358
Merge pull request #534 from EnergySystemsModellingLab/broadcast_errors2
tsmbland Oct 25, 2024
e469623
Bump version
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.2
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.2
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.2"
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
Loading