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.

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

Support of new BalanceType PROPORTIONAL_TO_GENERATION_PARTICIPATION_FACTOR and PROPORTIONAL_TO_GENERATION_REMAINING_MARGIN #702

Merged
merged 18 commits into from
Jan 26, 2023

Conversation

caioluke
Copy link
Member

@caioluke caioluke commented Jan 11, 2023

Requires upcoming version of powsybl-core to work
See changes from commit -> add two new BalanceTypes ... 9df191f
Other changes come from integration branch

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

  • 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)

Does this PR already have an issue describing the problem ? If so, link to this issue using '#XXX' and skip the rest

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Adds support to PROPORTIONAL_TO_GENERATION_PARTICIPATION_FACTOR and PROPORTIONAL_TO_GENERATION_REMAINING_MARGIN in balanceType

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change or deprecate an API? If yes, check the following:

  • The Breaking Change or Deprecated label has been added
  • The migration guide has been updated in the github wiki (What changes might users need to make in their application due to this PR?)

Other information:
Relates to
powsybl/powsybl-core#2402
powsybl/powsybl-core#2435

(if any of the questions/checkboxes don't apply, please delete them entirely)

@caioluke caioluke added the enhancement New feature or request label Jan 11, 2023
@caioluke caioluke requested a review from jeandemanged January 11, 2023 13:50
@caioluke caioluke self-assigned this Jan 11, 2023
@geofjamg
Copy link
Member

@caioluke be careful your branch seems to be very far from main! You should rebase you dev on main.

@caioluke
Copy link
Member Author

@caioluke be careful your branch seems to be very far from main! You should rebase you dev on main.

I have rebased it on integration core 5.1.0 snapshot yesterday to be able to use the features I needed from it

@caioluke caioluke requested a review from obrix January 19, 2023 15:45
geofjamg and others added 4 commits January 24, 2023 16:59
Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com>
Signed-off-by: Caio Luke <caio.luke@artelys.com>
Signed-off-by: Caio Luke <caio.luke@artelys.com>
Signed-off-by: Caio Luke <caio.luke@artelys.com>
annetill and others added 4 commits January 24, 2023 17:03
Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com>
Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com>
Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com>
@annetill annetill changed the title [WIP] Added support to new balanceTypes Support of new BalanceType PROPORTIONAL_TO_GENERATION_PARTICIPATION_FACTOR and PROPORTIONAL_TO_GENERATION_REMAINING_MARGIN Jan 24, 2023
@jeandemanged
Copy link
Member

sonar report lots of duplicate (relative to the modified code)

but I am not so sure of the best way to get rid of the code duplicates without compromising code readability ... should we really do something about it ?

Signed-off-by: Caio Luke <caio.luke@artelys.com>
cluke and others added 5 commits January 25, 2023 17:34
Signed-off-by: Caio Luke <caio.luke@artelys.com>
Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
case TARGET:
case REMAINING_MARGIN:
// nothing more to do here
// the check whether TargetP is within Pmin-Pmax range was already included in generator.isParticipating()
Copy link
Member

Choose a reason for hiding this comment

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

Fix the comment here maybe?

Copy link
Member

Choose a reason for hiding this comment

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

was unclear indeed, fixed this way:

                // nothing more to do here: the check whether TargetP is within Pmin-Pmax range
                // was already made in AbstractLfGenerator#checkActivePowerControl
                // whose result is reflected in generator.isParticipating()

@annetill annetill removed the enhancement New feature or request label Jan 26, 2023
jeandemanged and others added 4 commits January 26, 2023 09:42
Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

90.4% 90.4% Coverage
4.3% 4.3% Duplication

@annetill annetill merged commit d365ea3 into main Jan 26, 2023
@annetill annetill deleted the cgmesNominalPF branch January 26, 2023 09:04
geofjamg pushed a commit that referenced this pull request Jan 31, 2023
…ACTOR and PROPORTIONAL_TO_GENERATION_REMAINING_MARGIN (#702)

Signed-off-by: Caio Luke <caio.luke@artelys.com>
Co-authored-by: Anne Tilloy <anne.tilloy@rte-france.com>
Co-authored-by: Damien Jeandemange <damien.jeandemange@artelys.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants