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

add charge and discharge efficiencies as sensors #933

Merged
merged 26 commits into from Dec 21, 2023
Merged

add charge and discharge efficiencies as sensors #933

merged 26 commits into from Dec 21, 2023

Conversation

victorgarcia98
Copy link
Contributor

@victorgarcia98 victorgarcia98 commented Dec 18, 2023 •
edited by Flix6x

Description

This PR introduces two new fields to the flex-model:

  • charge-efficiency
  • discharge-efficiency

These fields allow to define changing down/up efficiencies using a Sensor.

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on code under GPL or other license that is incompatible with FlexMeasures

victorgarcia98 and others added 19 commits November 10, 2023 09:50
@victorgarcia98
add (device) consumption capacity and production capacity as sensors
91c2833 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
convert units of the power limits to the sensor units
63a390f 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
add QuantityOrSensor field
8b594b1 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
add annotations
4e27c51 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
introduce QuantityorSensor schema
ccbe5d6 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
add from __future__ import annotations
6b24016 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
Merge branch 'main' into feature/planning/battery-power-capacity-as-s…
4bf8217 
…ensor
@victorgarcia98
remove discarded revision
21537dd 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
add target unit
661bab6 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
change exception type to FMValidationError
8a5bdba 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
add explicity default value
35ada92 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
split into two functions
a9aaf21 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@Flix6x
Review/897/refactoring (#908)
f39c932 
* refactor: fix spelling

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

* style: missing type annotation

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

* refactor: method and variable renaming

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

* refactor: add test case explanations

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

---------

Signed-off-by: F.N. Claessen <felix@seita.nl>
@Flix6x
Review/897/distinguish fallback value and max value (#909)
9fadfcc 
* refactor: fix spelling

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

* style: missing type annotation

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

* refactor: method and variable renaming

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

* refactor: add test case explanations

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

* fix: separate logic for falling back on a default attribute and applying a maximum capacity limit

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

* fix: fill gaps in capacity sensor data using the max_value rather than with the fallback

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

* fix: type annotation (see https://docs.python.org/3/library/typing.html#typing.Optional)

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

* refactor: clearly separate steps of falling back and performing a nanmin

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

* refactor: simplify and have get_quantity_from_attribute return a Quantity, as its name already suggested

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

* refactor: switch argument order

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

* refactor: update docstring

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

* style: flake8

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

---------

Signed-off-by: F.N. Claessen <felix@seita.nl>
@victorgarcia98
Merge remote-tracking branch 'origin/main' into feature/planning/batt…
01f7fc0 
…ery-power-capacity-as-sensor

Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
fix test
b677897 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
add changelog entry
af65989 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
update changelog
5334df6 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
add charge and discharge efficiencies
2c3db2d 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98 victorgarcia98 self-assigned this Dec 18, 2023
@victorgarcia98
fix test
9bc3fa7 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
Base automatically changed from feature/planning/battery-power-capacity-as-sensor to main December 19, 2023 08:55
@Flix6x
Copy link
Contributor

Flix6x commented Dec 19, 2023

@victorgarcia98 this PR became too hard to review (due to mixed contents) after the base automatically changed from feature/planning/battery-power-capacity-as-sensor to main. Can you clean it up?

Flix6x
Flix6x reviewed Dec 19, 2023
View reviewed changes
Copy link
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 managed to review a few lines of code that probably actually belong in this PR. :)

flexmeasures/data/models/planning/storage.py Outdated Show resolved Hide resolved
flexmeasures/data/models/planning/tests/test_solver.py Outdated Show resolved Hide resolved
@victorgarcia98
merge main into feature/planning/use-efficiency-from-sensor
d560332 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
This was linked to issues Dec 19, 2023
Support for buffer assets #886
Closed
use roundtrip-efficiency from Sensor #903
Closed
@victorgarcia98
add extra validation and use 100 for the missing values instead of th…
70844e8 
…e roundtrip

Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
fix validation rules
5bd5d98 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
@victorgarcia98
check roundtrip efficiency
c09baff 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
Flix6x
Flix6x approved these changes Dec 20, 2023
View reviewed changes
Copy link
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.

Looks good. Let's add the changelog entry and the minimum required documentation (I believe in api/notation.rst and the trigger endpoint), and ship it.

nhoening
nhoening requested changes Dec 20, 2023
View reviewed changes
Copy link
Contributor

@nhoening nhoening left a comment

Choose a reason for hiding this comment

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

Found two smaller errors.

flexmeasures/data/schemas/scheduling/storage.py Show resolved Hide resolved
flexmeasures/data/schemas/scheduling/storage.py Outdated Show resolved Hide resolved
@victorgarcia98
Merge remote-tracking branch 'origin/main' into feature/planning/use-…
07407e7 
…efficiency-from-sensor
@victorgarcia98
add documentation
5d2cb51 
Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
Flix6x
Flix6x approved these changes Dec 20, 2023
View reviewed changes
Copy link
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.

Thanks for making the effort to get this in!

@Flix6x Flix6x added this to the 0.18.0 milestone Dec 21, 2023
@Flix6x Flix6x merged commit f5a14c8 into main Dec 21, 2023
8 of 9 checks passed
@Flix6x Flix6x deleted the feature/planning/use-efficiency-from-sensor branch December 21, 2023 10:56
@Flix6x Flix6x mentioned this pull request Jan 8, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Flix6x Flix6x Flix6x approved these changes

@nhoening nhoening Awaiting requested review from nhoening

Assignees

@victorgarcia98 victorgarcia98

Labels
API Scheduling
Projects
None yet
Milestone
0.18.0
Development

Successfully merging this pull request may close these issues.

use roundtrip-efficiency from Sensor Support for buffer assets
3 participants
@victorgarcia98 @Flix6x @nhoening