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

Create rescale mode for flow decomposition #146

Merged
merged 15 commits into from
May 31, 2024
Merged

Create rescale mode for flow decomposition #146

merged 15 commits into from
May 31, 2024

Conversation

caioluke
Copy link
Member

@caioluke caioluke commented May 22, 2024 •
edited by phiedw
Loading

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce?

Feature

What is the current behavior?

Currently we can only enable/disable rescaling in flow decomposition. This feature allows to choose different modes of rescaling.

What is the new behavior (if this is a feature change)?
Instead of only turning rescaling on and off, we can know choose different rescaling methods.

Does this PR introduce a breaking change or deprecate an API?

  • Yes
  • No

@caioluke caioluke self-assigned this May 22, 2024
@caioluke caioluke requested a review from OpenSuze May 22, 2024 13:10
@caioluke
Replace rescaleEnabled by rescaleMode
2d9cf28 
Signed-off-by: Caio Luke <caioluke97@gmail.com>
@caioluke caioluke force-pushed the create_rescale_mode branch from 988f2ff to 2d9cf28 Compare May 22, 2024 14:03
OpenSuze
OpenSuze reviewed May 23, 2024
View reviewed changes
Copy link
Contributor

@OpenSuze OpenSuze left a comment

Choose a reason for hiding this comment

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

Thank you for your PR !

flow-decomposition/src/main/java/com/powsybl/flow_decomposition/DecomposedFlowsRescaler.java Outdated Show resolved Hide resolved
flow-decomposition/src/main/java/com/powsybl/flow_decomposition/DecomposedFlowsRescaler.java Outdated Show resolved Hide resolved
flow-decomposition/src/main/java/com/powsybl/flow_decomposition/DecomposedFlow.java Outdated Show resolved Hide resolved
flow-decomposition/src/main/java/com/powsybl/flow_decomposition/FlowComputerUtils.java Outdated Show resolved Hide resolved
flow-decomposition/src/main/java/com/powsybl/flow_decomposition/DecomposedFlow.java Outdated Show resolved Hide resolved
caioluke added 4 commits May 23, 2024 14:57
@caioluke
create interface for DecomposedFlowRescaler
31a66d2 
Signed-off-by: Caio Luke <caioluke97@gmail.com>
@caioluke
create builder for DecomposedFlow
0e35b7e 
Signed-off-by: Caio Luke <caioluke97@gmail.com>
@caioluke
change modifier in FlowComputerUtils
1a043b7 
Signed-off-by: Caio Luke <caioluke97@gmail.com>
@caioluke
remove acMaxFlow and add acTerminal2ReferenceFlow instead
896e87f 
Signed-off-by: Caio Luke <caioluke97@gmail.com>
@caioluke
Copy link
Member Author

caioluke commented May 23, 2024 •
edited
Loading

@OpenSuze the tolerance test for the DecomposedFlowRescalerProportional (my rescaler) is still missing. But you can already have a look at the other modifications :)

Update: all good now!

caioluke added 3 commits May 24, 2024 10:15
@caioluke
add test rescaling proportional does nothing if the flow is small
c883982 
Signed-off-by: Caio Luke <caioluke97@gmail.com>
@caioluke
add test no op rescaler
e957ff7 
Signed-off-by: Caio Luke <caioluke97@gmail.com>
@caioluke
add test rescaler nan
e66a81f 
Signed-off-by: Caio Luke <caioluke97@gmail.com>
OpenSuze
OpenSuze reviewed May 24, 2024
View reviewed changes
Copy link
Contributor

@OpenSuze OpenSuze left a comment

Choose a reason for hiding this comment

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

Thank you for your work !

Note: As we changed some flow decomposition parameters, there might be some changes to do on the pypowsybl side, I can have a look at it

flow-decomposition/src/main/java/com/powsybl/flow_decomposition/DecomposedFlow.java Show resolved Hide resolved
flow-decomposition/src/main/java/com/powsybl/flow_decomposition/DecomposedFlowBuilder.java Show resolved Hide resolved
flow-decomposition/src/main/java/com/powsybl/flow_decomposition/DecomposedFlow.java Outdated Show resolved Hide resolved
...tion/src/main/java/com/powsybl/flow_decomposition/DecomposedFlowRescalerAcerMethodology.java Outdated Show resolved Hide resolved
...osition/src/main/java/com/powsybl/flow_decomposition/DecomposedFlowRescalerProportional.java Outdated Show resolved Hide resolved
flow-decomposition/src/main/java/com/powsybl/flow_decomposition/FlowDecompositionComputer.java Show resolved Hide resolved
flow-decomposition/src/test/java/com/powsybl/flow_decomposition/TestUtils.java Outdated Show resolved Hide resolved
...ecomposition/src/test/java/com/powsybl/flow_decomposition/FlowDecompositionResultsTests.java Show resolved Hide resolved
...ecomposition/src/test/java/com/powsybl/flow_decomposition/FlowDecompositionResultsTests.java Show resolved Hide resolved
flow-decomposition/src/test/java/com/powsybl/flow_decomposition/RescalingTests.java Outdated Show resolved Hide resolved
caioluke and others added 3 commits May 24, 2024 15:17
@caioluke
add proportional recaler min flow tolerance in FlowDecompositionParam…
b450a0a 
…eters, add tests

Signed-off-by: Caio Luke <caioluke97@gmail.com>
@caioluke
Copy link
Member Author

@OpenSuze I created a pull request for the docs update: powsybl/powsybl.github.io#322

@OpenSuze
Copy link
Contributor

@OpenSuze I created a pull request for the docs update: powsybl/powsybl.github.io#322

I am sorry, we forgot to remove the flow decomposition documentation from the powsybl.github.io repository.
The documentation has been moved to this repository (#142). We can more easily review the code and the documentation at the same time.
The documentation is availablle here now: https://github.com/powsybl/powsybl-entsoe/tree/main/docs/flow_decomposition
Can you add the documentation to this PR please ?

@caioluke
update docs
4d9e2b8 
Signed-off-by: Caio Luke <caioluke97@gmail.com>
@caioluke
Copy link
Member Author

@OpenSuze now we should be good :)

OpenSuze
OpenSuze approved these changes May 30, 2024
View reviewed changes
Copy link
Contributor

@OpenSuze OpenSuze left a comment

Choose a reason for hiding this comment

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

Thank you for this PR !

@caioluke
rename DecomposedFlowBuilder methods, adjust javadoc, return switch i…
a26d603 
…nstead of switch return

Signed-off-by: Caio Luke <caioluke97@gmail.com>
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented May 30, 2024

Quality Gate Passed Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
95.2% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@phiedw phiedw merged commit 470388e into main May 31, 2024
7 checks passed
@phiedw phiedw deleted the create_rescale_mode branch May 31, 2024 08:35
@OpenSuze OpenSuze added enhancement New feature or request and removed PR: ready-to-be-merged labels May 31, 2024
OpenSuze pushed a commit that referenced this pull request Jun 4, 2024
@caioluke @OpenSuze
Create rescale mode for flow decomposition (#146)
9ada372 
* Replaced rescaleEnabled with rescaleMode
* Created interface and implementations for DecomposedFlowRescaler
* Create builder for DecomposedFlow

Signed-off-by: Caio Luke <caioluke97@gmail.com>
Signed-off-by: Hugo SCHINDLER <hugo.schindler@rte-france.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@OpenSuze OpenSuze OpenSuze approved these changes

@phiedw phiedw phiedw approved these changes

Assignees

@caioluke caioluke

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@caioluke @OpenSuze @phiedw