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.

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

Jump to bottom

MUSE version 1.3.0 #554

Merged
merged 34 commits into from
Dec 3, 2024
Merged

MUSE version 1.3.0 #554

merged 34 commits into from
Dec 3, 2024

Conversation

tsmbland
Copy link
Collaborator

@tsmbland tsmbland commented Nov 5, 2024 •
edited
Loading

tsmbland and others added 14 commits November 5, 2024 16:59
@tsmbland
Simplify the agents module, and additional changes (#507)
2cbaf72 
* Add comments and simplify sector.next

* Simplify agent module, more comments

* Simplify retirment profile code

* Simplify merge_assets

* Revert change to merge_assets

* Delete unused factory

* More comments added to code

* Revert some changes to fix tests

* Fix tests

* Small fix to another test

* Remove more redundant code

* Fix test

* A few more tiny changes (e.g. typing)

* Remove inline comment

* Small changes to tidy up

* Be more explicit in _inner_split

* Apply suggestions from code review

* Switch copy to deepcopy
@tsmbland
Delete legacy sector (#510)
08ffd60
@tsmbland
Delete old/redundant outputs (#548)
92ca64e
@tsmbland
Remove unused production methods (#557)
6406723 
* Remove costed production method

* Remove match production method
@tsmbland
Hardcode production method in some functions (#559)
87132ab 
* Delete production module

* Switch one case of supply to maximum_production

* Fix test

* Update comments and docstrings

* Restore production module, only for dispatch

* Fix alignment in documentatioh
@tsmbland
Merge branch 'main' into v1.3
9b55d5d
@tsmbland
Fix calculation of material costs
ecb7288
@tsmbland
Fix calculation of variable costs
57e8665
@tsmbland
Revert change to output
0463175
@tsmbland
Fix error in variable cost calculation
19e856c
@tsmbland
Fix consumption function to allow non-1 outputs
c9d4c3e
@tsmbland
Revert "Fix consumption function to allow non-1 outputs"
1eb883d 
This reverts commit c9d4c3e.
@tsmbland
One more material costs error
ae45fa7
@tsmbland
Better name for tech_activity
9c7cfd1
@tsmbland tsmbland changed the base branch from main to costs November 12, 2024 17:29
tsmbland and others added 4 commits November 12, 2024 17:29
@tsmbland
Merge branch 'costs' into v1.3
b0697c6
@tsmbland
Fix error in fixed and variable costs
ebd0dcd
@tsmbland
Merge branch 'costs' into v1.3
cb253e6
@tsmbland @pre-commit-ci
Simplify the use of timeslices (#519)
18253ea 
* Add comments and simplify sector.next

* Simplify agent module, more comments

* Simplify retirment profile code

* Simplify merge_assets

* Revert change to merge_assets

* Delete unused factory

* More comments added to code

* Revert some changes to fix tests

* Fix tests

* Small fix to another test

* Delete legacy sector

* Delete tests and documentation

* Remove more redundant code

* Delete new_to_old_timeslice function

* Remove unnecessary convert_timeslice operations

* Use global TIMESLICE variable throughout

* Simplify some other parts of the code accordingly

* Draft new function with intended behaviour

* Use new function wherever possible

* Update tests

* Remove represent_hours function

* Fix issue with timeslice ordering

* Remove remaining convert_timeslice calls

* Simplify timeslice_op function

* Delete old convert_timeslice function

* Delete unused functions

* Simplify timeslie import process

* Formatting

* Default arguments for convert_timeslice

* Update results files

* Fix test

* Carry changes from fix_supply_issue2 branch

* More benign changes

* Fix incorrect convert_timeslice usage in tests

* Fix timeslice import in tests

* Delete unused fixture

* Fix market fixtures

* More test fixes

* Fix a fixture

* Move default timeslice settings to conftest

* Fix docstring tests

* A few more tiny changes (e.g. typing)

* Remove inline comment

* Small changes

* Fix constraints tests

* Fix remaining tests

* Create separate functions for broadcasting and distributing timeslices

* Check for existing timeslice dimension in broadcast_timeslice

* Fix test

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix merge conflicts

* Fix tests

* Remove timeslice arguments

* Fix tests

* Turn off automatic broadcasting over the timeslice dimension (#530)

* xarray patch to prevent automatic broadcasting

* Fix most remaining broadcasting bugs

* Fix some tests

* Fix more tests

* Simplify dlc constraint

* More timeslice broadcasting

* Fix incorrect uses of distribute_timeslice

* Fix bug in _inner_split

* Remove unnecessary drop_timeslice operations

* Fix correlation model

* Fix a couple of tests

* Restore drop_timeslice

* Restore more drop_timeslice

* Fix demand_matching tests

* Fix correlation model

* Consistent timeslice dimension in objectives

* Revert change to capacity_in_use

* Fix objective tests

* Fix more tests

* Fix another test

* Fix final test (hopefully)

* Drop convert_market_timeslice

* Remove timeslice attribute from sectors

* Delete sections from documentation

* Rename timeslice_op, add docstring

* Docstring and better error message for patch

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Base automatically changed from costs to main November 13, 2024 09:55
tsmbland and others added 8 commits November 13, 2024 10:36
@tsmbland
Merge branch 'main' into v1.3
375ebee
@tsmbland
Merge branch 'main' into v1.3
c423ad5
@tsmbland
Delete merge_lp function - not used
31a985c
@tsmbland
Merge branch 'main' into v1.3
c5e231c
@tsmbland
Delete unused code (#576)
6ec0ec2 
* Delete unused output.py file

* Delete unused function from csv.py

* Delete unused fixtures and functions from tests

* Remove output.py from example model
@tsmbland
Adding support for Python 3.13 (#564)
5b69758 
* Upgrade to 3.13

* Unpin numpy
@tsmbland @pre-commit-ci
Configurable timeslice level for sectors (#550)
dd12ee8 
* Add comments and simplify sector.next

* Simplify agent module, more comments

* Simplify retirment profile code

* Simplify merge_assets

* Revert change to merge_assets

* Delete unused factory

* More comments added to code

* Revert some changes to fix tests

* Fix tests

* Small fix to another test

* Delete legacy sector

* Delete tests and documentation

* Remove more redundant code

* Delete new_to_old_timeslice function

* Remove unnecessary convert_timeslice operations

* Use global TIMESLICE variable throughout

* Simplify some other parts of the code accordingly

* Draft new function with intended behaviour

* Use new function wherever possible

* Update tests

* Remove represent_hours function

* Fix issue with timeslice ordering

* Remove remaining convert_timeslice calls

* Simplify timeslice_op function

* Delete old convert_timeslice function

* Delete unused functions

* Simplify timeslie import process

* Formatting

* Default arguments for convert_timeslice

* Update results files

* Fix test

* Carry changes from fix_supply_issue2 branch

* More benign changes

* Fix incorrect convert_timeslice usage in tests

* Fix timeslice import in tests

* Delete unused fixture

* Fix market fixtures

* More test fixes

* Fix a fixture

* Move default timeslice settings to conftest

* Fix docstring tests

* A few more tiny changes (e.g. typing)

* Remove inline comment

* Small changes

* Fix constraints tests

* Fix remaining tests

* Create separate functions for broadcasting and distributing timeslices

* Check for existing timeslice dimension in broadcast_timeslice

* Fix test

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix merge conflicts

* Fix tests

* Remove timeslice arguments

* Fix tests

* Turn off automatic broadcasting over the timeslice dimension (#530)

* xarray patch to prevent automatic broadcasting

* Fix most remaining broadcasting bugs

* Fix some tests

* Fix more tests

* Simplify dlc constraint

* More timeslice broadcasting

* Fix incorrect uses of distribute_timeslice

* Fix bug in _inner_split

* Remove unnecessary drop_timeslice operations

* Fix correlation model

* Fix a couple of tests

* Restore drop_timeslice

* Restore more drop_timeslice

* Fix demand_matching tests

* Fix correlation model

* Consistent timeslice dimension in objectives

* Revert change to capacity_in_use

* Fix objective tests

* Fix more tests

* Fix another test

* Fix final test (hopefully)

* Drop convert_market_timeslice

* Remove timeslice attribute from sectors

* Add dummy timeslice_level argument

* Read timeslice_level from settings file

* Add basic transforms

* Fix some errors from merge

* Placeholder functions for sector conversion

* Functions working with single timeslice level

* Working compress_timeslice function

* Typing, remove aggregates, skeleton for tests

* Skeleton for tests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Restore patch to tests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Tests for broadcast and distribute, replace transforms with compress

* Test for compress_timeslice

* Finish functions and tests

* Change type hinting to work with 3.9

* Same again

* Lint

* Improve tests

* Add parameter descriptions

* Docstrings for new functions, use get_level

* Add documentation

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Finish compress_timeslice (still small todo)

* sort_timeslice and timeslice_max functions

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* New tests, some robustness improvements

* Move import statements

* Add check to sector init

* Variable names, docstrings

* Apply default timeslice level to sector

* Fix adhoc bug, add warning

* Fix error in convert_to_global_timeslicing

* Use modern syntax for type annotations

* Address reviewer comments

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@tsmbland
Merge branch 'main' into v1.3
f94ee1b
@tsmbland tsmbland mentioned this pull request Nov 28, 2024
Closed
8 tasks
@tsmbland @pre-commit-ci
Enforce consistency in objective dimensions (#584)
e448b09 
* Enforce that all objectives have an asset dimension

* Check inputs to objectives

* Temporarily suppress tests

* Bump version

* [pre-commit.ci] pre-commit autoupdate (#579)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.7.4 → v0.8.0](astral-sh/ruff-pre-commit@v0.7.4...v0.8.0)
- [github.com/igorshubovych/markdownlint-cli: v0.42.0 → v0.43.0](igorshubovych/markdownlint-cli@v0.42.0...v0.43.0)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Revert "Bump version"

This reverts commit 3d223e6.

* Add check_dimensions function

* Add checks for demand_share dimensions

* Add dst_region to check

* Fix more checks

* And more

* Fix function default args

* Remove xfail mark

* More descriptive comment

* Address reviewer comments

* Allow function to work with any iterable of strings

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
tsmbland and others added 6 commits November 29, 2024 15:39
@tsmbland
Delete changelog
d44fbb3
@tsmbland
Fix demand fulfillment check (#590)
0b69cba 
* Switch demand fulfillment check to annual

* More informative error message

* Revert "More informative error message"

This reverts commit 11ac0c5.
@tsmbland
Change theme to sphinx_rtd (#592)
9c87060
@tsmbland
Change default solver to scipy (#587)
4dc5f52 
* Change default solver to scipy

* Add warning if lpsolver is not specified

* Fix failing test

* Clearer documentation about default solver
@tsmbland
Merge branch 'main' into v1.3
d21cd3f
@tsmbland
Add release notes for v1.3.0 (#593)
a79c2e0 
* Add release notes for v1.3.0

* Add v1.3 notes to menu

* Small text changes

* Add note about bug fix
@tsmbland tsmbland marked this pull request as ready for review December 3, 2024 11:54
@tsmbland tsmbland merged commit 9e9e7b9 into main Dec 3, 2024
14 checks passed
@tsmbland tsmbland deleted the v1.3 branch December 3, 2024 12:42
@tsmbland tsmbland restored the v1.3 branch December 3, 2024 12:43
@tsmbland tsmbland deleted the v1.3 branch December 3, 2024 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
MUSE
Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@tsmbland