Skip to content

Add multi‑commodity support to device scheduler#1946

Draft
Ahmad-Wahid wants to merge 47 commits intofeat/switching-between-gas-and-electricityfrom
feat/multi-commodity
Draft

Add multi‑commodity support to device scheduler#1946
Ahmad-Wahid wants to merge 47 commits intofeat/switching-between-gas-and-electricityfrom
feat/multi-commodity

Conversation

@Ahmad-Wahid
Copy link
Copy Markdown
Contributor

@Ahmad-Wahid Ahmad-Wahid commented Feb 3, 2026 •
edited
Loading

This PR adds initial support for multi‑commodity commitments (e.g. gas and electricity) in the device_scheduler, building on the grouped‑devices functionality. Flow commitments can now be tagged with a commodity, and EMS‑level flow constraints are applied per commodity by aggregating the relevant devices.

TODO

  • Specify how commodity is encoded per device in the flex‑model
  • Exclude non‑matching commodities (e.g. gas devices) from EMS electricity commitments
  • Extend flex‑model schema with commodity metadata
  • add gas-price field to flex-context
  • set up gas commitment using gas-powered devices and gas-price
  • Update scheduling.rst
  • Add tutorial examples for multi‑commodity scheduling

closes https://github.com/SeitaBV/simulations/issues/987

@read-the-docs-community
Copy link
Copy Markdown

read-the-docs-community bot commented Feb 3, 2026 •
edited
Loading

Documentation build overview

📚 flexmeasures | 🛠️ Build #31957437 | 📁 Comparing de4981e against latest (d9840bf)


🔍 Preview build

Show files changed (6 files in total): 📝 4 modified | ➕ 2 added | ➖ 0 deleted
File Status
genindex.html 📝 modified
_autodoc/COMMODITY.html ➕ added
_autodoc/GAS_PRICE.html ➕ added
_autosummary/flexmeasures.data.models.planning.html 📝 modified
_autosummary/flexmeasures.data.models.planning.storage.html 📝 modified
api/v3_0.html 📝 modified

Ahmad-Wahid and others added 15 commits February 3, 2026 02:09
@Ahmad-Wahid
remove hard check for commodity to make backward compatible
8c9b1b5 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
update the function to support backward compatibility
a8f3b89 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
feat: add commodity field to the flexmodel and DBstorage-flex-model s…
be09c4d 
…chemas

Signed-off-by: Ahmad-Wahid <[email protected]>
@Flix6x
fix: use devices as index rather than time series
07822eb 
Signed-off-by: F.N. Claessen <[email protected]>
@Flix6x
fix: exclude gas-power devices from electricity commitments
92eabc7 
Signed-off-by: F.N. Claessen <[email protected]>
@Flix6x
Merge branch 'feat/switching-between-gas-and-electricity' into feat/m…
f9df705 
…ulti-commodity
@Ahmad-Wahid
feat: add gas-price field to the Flex-context schema
325bfe8 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
apply black
9261629 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
feat: add a test case for two flexible devices with commodity
9dd5802 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
use expected datatypes
b22c6d7 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
feat: split commitments per commodity
c88af5c 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
feat: split commitments per commodity
c2341f1 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
Merge remote-tracking branch 'origin/feat/multi-commodity' into feat/…
88d4be0 
…multi-commodity
@Ahmad-Wahid
Revert "use expected datatypes"
be05a19 
This reverts commit b22c6d7.
@Ahmad-Wahid
feat: add a test case for different commodities
f4ffd8a 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid Ahmad-Wahid requested a review from Flix6x February 16, 2026 11:51
@Ahmad-Wahid Ahmad-Wahid self-assigned this Feb 16, 2026
@Ahmad-Wahid Ahmad-Wahid added enhancement New feature or request Scheduling labels Feb 16, 2026
@Ahmad-Wahid
Copy link
Copy Markdown
Contributor Author

Ahmad-Wahid commented Feb 16, 2026

@Flix6x could you please suggest some assertions for both test cases?

@Flix6x
Copy link
Copy Markdown
Contributor

Flix6x commented Feb 19, 2026

Please comment on why the test suite is failing.

@Ahmad-Wahid
Copy link
Copy Markdown
Contributor Author

Ahmad-Wahid commented Feb 19, 2026

Please try to run these test cases: test_two_flexible_assets_with_commodity and test_mixed_gas_and_electricity_assets

Flix6x
Flix6x requested changes Feb 19, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@Flix6x Flix6x left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed the two tests.

@Flix6x
fix: do not produce gas
c43d2ad 
Signed-off-by: F.N. Claessen <[email protected]>
Copilot AI mentioned this pull request Feb 26, 2026
Draft
Copy link
Copy Markdown
Contributor

Copilot AI commented Feb 26, 2026

@Flix6x I've opened a new pull request, #1991, to work on those changes. Once the pull request is ready, I'll request review from you.

Flix6x
Flix6x reviewed Feb 26, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@Flix6x Flix6x left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should look those failing tests, too.

@Ahmad-Wahid
Copy link
Copy Markdown
Contributor Author

Ahmad-Wahid commented Feb 27, 2026 •
edited
Loading

Here are all the failed tests from the job, along with their failure reasons:

  • 1. flexmeasures/data/models/planning/tests/test_solver.py::test_battery_storage_different_units[power (kW)-MWh-kWh]

    • Reason: Assertion failed. The test expected (sum).0.25 == 0.9, but the sum was 0.0.

  • 2. flexmeasures/data/models/planning/tests/test_solver.py::test_unavoidable_capacity_breach

    • Reason: Assertion failed. The solver’s termination status was infeasibleOrUnbounded, but 'optimal' was expected.

  • 3. flexmeasures/data/models/planning/tests/test_solver.py::test_multiple_commitments_per_group

    • Reason: Assertion failed. The solver’s termination status was infeasibleOrUnbounded instead of 'optimal'.

  • 4. flexmeasures/data/models/planning/tests/test_solver.py::test_multiple_devices_simultaneous_scheduler

    • Reason: Assertion failed. The solver’s termination status was infeasibleOrUnbounded rather than 'optimal'.

  • 5. flexmeasures/data/models/planning/tests/test_solver.py::test_multiple_devices_sequential_scheduler

    • Reason: Assertion failed. The solver’s termination status was infeasibleOrUnbounded rather than 'optimal'.

  • 6. flexmeasures/data/models/planning/tests/test_storage.py::test_battery_solver_multi_commitment

    • Reason: KeyError for 'energy' during test execution.

  • 7. flexmeasures/data/tests/test_scheduling_simultaneous.py::test_create_simultaneous_jobs[True]

    • Reason: Assertion failed. EV cost was €2.3125 but the test expected €2.2375.

  • 8. flexmeasures/data/tests/test_scheduling_simultaneous.py::test_create_simultaneous_jobs[False]

    • Reason: Assertion failed. EV cost was €2.3125 but the test expected €2.2375.

  • 9. flexmeasures/ui/tests/test_utils.py::test_ui_flexcontext_schema

    • Reason: Assertion failed. Likely due to a new flex-context field added to the codebase without corresponding UI support. The set of keys did not match the reference set.

  • 10. flexmeasures/ui/tests/test_utils.py::test_ui_flexmodel_schema

    • Reason: Assertion failed. There are unexpected/extra items in the flexmodel schema output set compared to the reference set.

@Ahmad-Wahid
update and add new assertions with clear explanation
515f34a 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
update the docstring
4d77344 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
refactor: move tiny-price-slope decleration out of the for loop
2becd02 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
Revert "refactor: move tiny-price-slope decleration out of the for loop"
d9d4f94 
This reverts commit 2becd02.
@Ahmad-Wahid
refactor: move tiny-price-slope decleration out of the for loop
2a22fae 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
fix: add data_key attr
f38d6d8 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
add missing commodity description and it's field in ui flexmodel schema
007e514 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Ahmad-Wahid
fix: add missing gas-price field in UI Flexcontext schema
0bff8bc 
Signed-off-by: Ahmad-Wahid <[email protected]>
@Flix6x
Copy link
Copy Markdown
Contributor

Flix6x commented Mar 13, 2026 •
edited
Loading

@Ahmad-Wahid Maybe we should move the preference to charge sooner (and discharge later) to a per-device StockCommitment instead of a per-device FlowCommitment. The StockCommitment should use a tiny negative up-price for SoC > 0, and no down-price, so it prefers being full over being empty, all else being equal.

Update: moved out to #2023

Flix6x and others added 8 commits March 19, 2026 12:24
@Flix6x
Merge remote-tracking branch 'origin/feat/full-soc-preference' into f…
7acbc99 
…eat/multi-commodity

# Conflicts:
#	documentation/concepts/commitments.rst
#	flexmeasures/data/models/planning/__init__.py
#	flexmeasures/data/models/planning/storage.py
@Flix6x
Merge branch 'feat/switching-between-gas-and-electricity' into feat/m…
c09371a 
…ulti-commodity
@Ahmad-Wahid
Merge remote-tracking branch 'origin/feat/switching-between-gas-and-e…
19dc4dc 
…lectricity' into feat/multi-commodity

# Conflicts:
#	flexmeasures/data/models/planning/tests/test_commitments.py
@Flix6x
fix: check curtailment preference per distinct device
e4c43ea 
Signed-off-by: F.N. Claessen <[email protected]>
@Flix6x
fix: set tight tolerance for HiGHS solver
b3138c3 
Signed-off-by: F.N. Claessen <[email protected]>
@Flix6x
refactor: merge if-blocks
8eff839 
Signed-off-by: F.N. Claessen <[email protected]>
@Flix6x
fix: update test_two_flexible_assets_with_commodity
b0074d4 
Signed-off-by: F.N. Claessen <[email protected]>
@Ahmad-Wahid
Merge remote-tracking branch 'origin/feat/multi-commodity' into feat/…
ae23ef6 
…multi-commodity
@nhoening nhoening added this to the 0.32.0 milestone Mar 20, 2026
@Flix6x Flix6x mentioned this pull request Mar 23, 2026
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nhoening nhoening nhoening left review comments

@Flix6x Flix6x Flix6x requested changes

Assignees

@Ahmad-Wahid Ahmad-Wahid

Labels

enhancement New feature or request Scheduling

Projects

None yet

Milestone

0.32.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Ahmad-Wahid @Flix6x @nhoening