Skip to content
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.

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

MUSE version 1.3.0 #554

Merged
merged 34 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2cbaf72
Simplify the agents module, and additional changes (#507)
tsmbland Nov 5, 2024
08ffd60
Delete legacy sector (#510)
tsmbland Nov 5, 2024
92ca64e
Delete old/redundant outputs (#548)
tsmbland Nov 5, 2024
6406723
Remove unused production methods (#557)
tsmbland Nov 8, 2024
87132ab
Hardcode production method in some functions (#559)
tsmbland Nov 11, 2024
9b55d5d
Merge branch 'main' into v1.3
tsmbland Nov 12, 2024
ecb7288
Fix calculation of material costs
tsmbland Nov 12, 2024
57e8665
Fix calculation of variable costs
tsmbland Nov 12, 2024
0463175
Revert change to output
tsmbland Nov 12, 2024
19e856c
Fix error in variable cost calculation
tsmbland Nov 12, 2024
c9d4c3e
Fix consumption function to allow non-1 outputs
tsmbland Nov 12, 2024
1eb883d
Revert "Fix consumption function to allow non-1 outputs"
tsmbland Nov 12, 2024
ae45fa7
One more material costs error
tsmbland Nov 12, 2024
9c7cfd1
Better name for tech_activity
tsmbland Nov 12, 2024
b0697c6
Merge branch 'costs' into v1.3
tsmbland Nov 12, 2024
ebd0dcd
Fix error in fixed and variable costs
tsmbland Nov 12, 2024
cb253e6
Merge branch 'costs' into v1.3
tsmbland Nov 12, 2024
18253ea
Simplify the use of timeslices (#519)
tsmbland Nov 13, 2024
375ebee
Merge branch 'main' into v1.3
tsmbland Nov 13, 2024
c423ad5
Merge branch 'main' into v1.3
tsmbland Nov 19, 2024
31a985c
Delete merge_lp function - not used
tsmbland Nov 20, 2024
c5e231c
Merge branch 'main' into v1.3
tsmbland Nov 20, 2024
6ec0ec2
Delete unused code (#576)
tsmbland Nov 20, 2024
5b69758
Adding support for Python 3.13 (#564)
tsmbland Nov 21, 2024
dd12ee8
Configurable timeslice level for sectors (#550)
tsmbland Nov 26, 2024
f94ee1b
Merge branch 'main' into v1.3
tsmbland Nov 27, 2024
e448b09
Enforce consistency in objective dimensions (#584)
tsmbland Nov 29, 2024
d44fbb3
Delete changelog
tsmbland Nov 29, 2024
0b69cba
Fix demand fulfillment check (#590)
tsmbland Dec 2, 2024
9c87060
Change theme to sphinx_rtd (#592)
tsmbland Dec 3, 2024
4dc5f52
Change default solver to scipy (#587)
tsmbland Dec 3, 2024
d21cd3f
Merge branch 'main' into v1.3
tsmbland Dec 3, 2024
a79c2e0
Add release notes for v1.3.0 (#593)
tsmbland Dec 3, 2024
64e55a9
Add release date
tsmbland Dec 3, 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.2.3
current_version = 1.3.0
commit = True
tag = True

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
# Test with the earliest and the latest python versions supported
python-version: ["3.9", "3.12"]
python-version: ["3.9", "3.13"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
# Test with the earliest and the latest python versions supported
python-version: ["3.9", "3.12"]
python-version: ["3.9", "3.13"]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.12
python-version: 3.13
- name: Install dependencies
run: |
sudo apt update -y
Expand Down
91 changes: 0 additions & 91 deletions CHANGELOG.md

This file was deleted.

4 changes: 2 additions & 2 deletions CITATION.cff
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.3
date-released: 2024-11-19
version: v1.3.0
date-released: 2024-12-03
5 changes: 0 additions & 5 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ PresetSector
.. autoclass:: muse.sectors.preset_sector.PresetSector
:members:

LegacySector
~~~~~~~~~~~~

.. autoclass:: muse.sectors.legacy_sector.LegacySector
:members:

Production
~~~~~~~~~~
Expand Down
6 changes: 2 additions & 4 deletions docs/application-flow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -503,11 +503,9 @@ The dispatch stage when running a sector can be described by the following graph

After the investment stage is completed, then the new capacity of the sector is obtained by aggregating the assets of all agents of the sector. Then, the supply of commodities is calculated as requested by the ``dispatch_production`` argument defined for each sector in the ``settings.toml`` file.

The typical choice used in most examples in MUSE is ``share``, where the utilization across similar assets is the same in percentage. However, there are other options available, like

- ``costed``: assets are ranked by their levelised costs and the cheaper ones are allowed to service the demand first up to their maximum production. Minimum service can be imposed if present.
There are two possible options for ``dispatch_production`` built into MUSE:
- ``share``: assets each supply a proportion of demand based on their share of total capacity.
- ``maximum``: all the assets dispatch their maximum production, regardless of the demand.
- ``match``: supply matches the demand within the constrains on how much an asset can produce while minimizing the overall associated costs. ``match`` allows the choice between different metrics to rank assets, such as levelised costs and gross margin. See :py:mod:`muse.demand_matching` for the mathematical details.

Once the supply is obtained, the consumed commodities required to achieve that production level are calculated. The cheapest fuel for flexible technologies is used.

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
project = "MUSE"
copyright = "2024, Imperial College London"
author = "Imperial College London"
release = "1.2.3"
release = "1.3.0"
version = ".".join(release.split(".")[:2])

# -- General configuration ---------------------------------------------------
Expand Down Expand Up @@ -63,7 +63,7 @@

# -- Options for HTML output -------------------------------------------------

html_theme = "classic"
html_theme = "sphinx_rtd_theme"

# -- Render GitHub links -------------------------------------------------

Expand Down
Loading
Loading