Combined Heat and Power (CHP)#2218

Draft

Flix6x wants to merge 245 commits into

mainfrom

Flix6x commented Jun 2, 2026

Member

Description

Support coupling constraints in the device_scheduler to model devices such as CHP
Added changelog item in documentation/changelog.rst

Look & Feel

...

How to test

New tests:

pytest -k test_chp_coupling
pytest -k test_factory_chp_dispatch

Further Improvements

...

Related Items

...

Flix6x and others added 30 commits

December 5, 2025 16:50


          docs: new section describing commitments

9dd779a

Signed-off-by: F.N. Claessen <felix@seita.nl>


          docs: rewrite the overview in commitments section

13e9308

Signed-off-by: F.N. Claessen <felix@seita.nl>


          docs: keep ems variables, but explain them as representing the site c…

…ontext

Signed-off-by: F.N. Claessen <felix@seita.nl>


          docs: cross-reference the commitments section and the linear problem …

1b10360

…formulation

Signed-off-by: F.N. Claessen <felix@seita.nl>


          Merge remote-tracking branch 'refs/remotes/origin/main' into docs/com…

0d25b25

…mitments-section


          fix: cross-references

6f6e52b

Signed-off-by: F.N. Claessen <felix@seita.nl>


          docs: add commitments section to index

Signed-off-by: F.N. Claessen <felix@seita.nl>


          Merge remote-tracking branch 'refs/remotes/origin/main' into docs/com…

ce1533d

…mitments-section


          feat: add a util function for printing out commitments in a tabulated…

84fbd5a

… format


          refactor: move pretty printing method to class

90177bf

Signed-off-by: F.N. Claessen <felix@seita.nl>


          feat: Commitment supports device groups

9f34676

Signed-off-by: F.N. Claessen <felix@seita.nl>


          feat: start testing device grouping

43107c8

Signed-off-by: F.N. Claessen <felix@seita.nl>


          dev: test multi-feed

b90d7f0

Signed-off-by: F.N. Claessen <felix@seita.nl>


          update the ids of devices to be integers


          feat: function that group commitment quantities

8b108ed

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          add commitments for multi group

485349e

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          fix: get unique list of devices for a frame column

81bb9ec

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          fix: create util functions that extract devices for a list of values …

334e4d3

…and map them to the respective group id

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          fix: create a series for a list of grouped devices

f738d9f

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          drop outdated comments

620c6dc


          use commitment costs and add asserts for electricity and gas

40eb747

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          and an assert for commodity costs

708d869

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          add an extra assert on costs

ce307f8

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          support commodity based EMS flow commitments and grouped devices

5be555b

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          Add commodity field and support multi-device commitments

6f2d745

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          test shared buffer and multi-comodity commitments

1d63893

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          remove hard check for commodity to make backward compatible

8c9b1b5

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          update the function to support backward compatibility

a8f3b89

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          feat: add commodity field to the flexmodel and DBstorage-flex-model s…

be09c4d

…chemas

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>


          fix: use devices as index rather than time series

07822eb

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Flix6x and others added 27 commits

June 8, 2026 17:34


          chore: black

bc6a88f

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          chore: black

c1c7d96

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          fix: optional dict key

a7773a8

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          Merge remote-tracking branch 'origin/dev/split-flexcontext-by-commodi…

ae42d6e

…ty' into feat/chp


          fix: keep ems-constraints and fix the test cases (#2233)

229349d

* fix: keep ems-constraints and fix the test cases

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

* Update flexmeasures/data/models/planning/storage.py

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com>
Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

* fix: update the comment and raise value error if ems_constraints_group is not passed

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

---------

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>
Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>
Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com>


          fix: keep ems-constraints and fix the test cases (#2233)

bf09a81

* fix: keep ems-constraints and fix the test cases

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

* Update flexmeasures/data/models/planning/storage.py

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com>
Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

* fix: update the comment and raise value error if ems_constraints_group is not passed

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

---------

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>
Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>
Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com>
Signed-off-by: F.N. Claessen <claessen@seita.nl>


          fix: only raise in case of multiple EMS constraint DataFrames

926941a

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          Merge remote-tracking branch 'origin/dev/split-flexcontext-by-commodi…

9f5d342

…ty' into feat/chp

# Conflicts:
#	flexmeasures/data/models/planning/linear_optimization.py


          chore: the wait for marshmallow-code/apispec#999 is over

953d3f1

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          feat: allow any commodity, with electricity and gas serving as examples

c6b8223

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          delete: remove unreleased flex-context field for gas price

b706f79

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          fix: add all relaxation fields to the list of fields to ignore when m…

b5f2c27

…oving old flex-context fields into the electricity commodity context

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          delete: gas_price is no longer a field (remove reference to unrelease…

bd972aa

…d field)

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          delete: just treat the whole old flex-context as the electricity flex…

bcd54de

…-context

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          chore: update openapi-specs.json

ed17a93

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          Merge branch 'dev/split-flexcontext-by-commodity' into feat/chp

28d4529


          feat: list the commodity field first rather than last

afa5eb5

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          feat: commodity is a field in both flex-model and flex-context

bf22eb8

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          feat: flex-model commodity can also be more than just electricity and…

710bf22

… gas

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          docs: remove mention of gas-price field

410bb4c

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          docs: adjust scheduling section for multi-commodity

e994767

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          docs: adjust field descriptions for multi-commodity

12ff212

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          docs: add type annotation

c664e2a

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          fix: keep track of inflexible device sensors per commodity, too

fd66372

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          refactor: place all group args at the end

7d99f1a

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          dev: add todos for checking prices

73f8004

Signed-off-by: F.N. Claessen <claessen@seita.nl>


          fix: test should exclude COMMODITY_FLEX_CONTEXT and COMMODITY_FLEX_MO…

e3f7cbd

…DEL, which are named commodity in scheduling.rst

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Base automatically changed from dev/split-flexcontext-by-commodity to feat/multi-feed-stock

July 7, 2026 12:16

Base automatically changed from feat/multi-feed-stock to feat/multi-commodity

July 7, 2026 12:37

Base automatically changed from feat/multi-commodity to main

July 8, 2026 15:58

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels