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 Current limit two levels automaton #209

Merged
merged 40 commits into from
May 30, 2023
Merged

Add Current limit two levels automaton #209

merged 40 commits into from
May 30, 2023

Conversation

Lisrte
Copy link
Contributor

@Lisrte Lisrte commented Apr 21, 2023

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

Lisrte added 23 commits April 5, 2023 13:17
@Lisrte
Replace Event disconnection in DSL with Disconnect and DisconnectQuad…
618f668 
…ripole

Handle quadripole disconnection

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add default model and quadripole disconnection for Transformer
02849d6 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Fix quadripole disconnection
6d38349 
Add UT

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Handle default & dynamic model disconnection
d837b66 
Add disconnection UT
Add default model Load

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add default model generator
f2a0c41 
Fix UT

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Merge equipment and quadripole equipment disconnection event in DSL
30aef8a 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Fix after branch update
4fc95eb 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add test coverage
9d0dc6e 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Review fix
b333430 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Refactor event constructor
d76813c 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add Load with tap changer
89e185d 
Add Tap changer blocking automaton

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Refactor Load with tap changer
8ac8af6 
Add UT

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add TapChangerAutomaton
9c6dc3d 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add TapChangerBlockingAutomaton to TapChangerAutomaton connection
d81be5e 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add TapChangerBlockingAutomaton libs
a11c80f 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add phase shifter automatons
8df0020 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Fix copyrights & UT
941ab22 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Connect quadripole to Current limit automaton
3995d5b 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add transformer to quadripole interface
eaf818d 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Remove QuadripoleDisconnectableEquipment and use QuadripoleModel instead
94e5519 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Use Branch instead of Identifiable
88708eb 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add CurrentLimitTwoLevelsAutomaton
36fec45 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Use Branch instead of Identifiable
1c2c223 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte Lisrte requested a review from flo-dup April 21, 2023 07:37
@Lisrte Lisrte self-assigned this Apr 21, 2023
Lisrte added 5 commits May 4, 2023 13:51
@Lisrte
Separate measured and controlled quadripoles in CLA
07787a2 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Merge branch 'connect_cla_to_quadripole' into add_cla_two_levels
4b19aef 
# Conflicts:
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/CurrentLimitAutomaton.java
@Lisrte
Separate measured and controlled quadripoles in CLA two levels
5ad56e2 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Merge branch 'main' into connect_cla_to_quadripole
c6eeb77 
# Conflicts:
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/AbstractPureDynamicGroovyExtension.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/automatons/AbstractPhaseShifterModelBuilder.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/automatons/PhaseShifterIAutomatonGroovyExtension.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/automatons/PhaseShifterPAutomatonGroovyExtension.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/automatons/TapChangerAutomatonGroovyExtension.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/automatons/TapChangerBlockingAutomatonGroovyExtension.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/events/EventDisconnectionGroovyExtension.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/automatons/CurrentLimitAutomatonGroovyExtension.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/loads/LoadOneTransformerTapChangerGroovyExtension.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/loads/LoadTwoTransformersGroovyExtension.groovy
#	dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/loads/LoadTwoTransformersTapChangersGroovyExtension.groovy
#	dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java
#	dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/EventModelsSupplierTest.java
#	dynawaltz-dsl/src/test/resources/dynamicModels/tapChangerBlocking.groovy
#	dynawaltz-dsl/src/test/resources/dynamicModels/tapChangerBusException.groovy
#	dynawaltz-dsl/src/test/resources/dynamicModels/tapChangerCompatibleException.groovy
#	dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.dyd
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/TransformerSide.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerAutomaton.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerBlockingAutomaton.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/phaseshifters/PhaseShifterIAutomaton.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/DisconnectableEquipment.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventQuadripoleDisconnection.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventSetPointBoolean.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/AbstractGeneratorModel.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/DefaultGeneratorModel.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorModel.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/OmegaRefGeneratorModel.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoad.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformer.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChanger.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformers.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangers.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadWithTransformers.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/DefaultTransformerModel.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TapChangerModel.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatio.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerModel.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/models/lines/StandardLineTest.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/CustomParameterResolver.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectEventXmlTest.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynaWaltzTestUtil.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicModelsXmlTest.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EventXmlTest.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/LoadsModelXmlTest.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/MappedParameterContext.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/PhaseShiftersXmlTest.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerAutomatonExceptionsXmlTest.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerAutomatonXmlTest.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerBlockingAutomatonXmlTest.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerBlockingToTapChangerAutomatonXmlTest.java
#	dynawaltz/src/test/resources/disconnect_dyd.xml
#	dynawaltz/src/test/resources/events.xml
#	dynawaltz/src/test/resources/phase_shifter_i_dyd.xml
#	dynawaltz/src/test/resources/tap_changer_blocking_dyd.xml
@Lisrte
Fix post rebase
8d03390 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
Lisrte and others added 7 commits May 9, 2023 16:32
@Lisrte
Fix coverage
37c14ed 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@flo-dup
Merge branch 'main' into connect_cla_to_quadripole
df9ea75 
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@Lisrte
Review fix
a1f3eaf 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add dynamic lib for CLA
fd3d605 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Merge branch 'connect_cla_to_quadripole' into add_cla_two_levels
eb496af 
Signed-off-by: Lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add dynamic lib for CLA two levels
825db5b 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
use method instead of field
bf2cbe5 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
Base automatically changed from connect_cla_to_quadripole to main May 25, 2023 13:28
@Lisrte
Merge branch 'main' into add_cla_two_levels
eb492fd 
Signed-off-by: Lisrte <laurent.issertial@rte-france.com>
flo-dup
flo-dup requested changes May 25, 2023
View reviewed changes
...tz/src/main/java/com/powsybl/dynawaltz/models/automatons/CurrentLimitTwoLevelsAutomaton.java Outdated
}

public CurrentLimitTwoLevelsAutomaton(String dynamicModelId, String parameterSetId, Branch<?> measuredQuadripole, Side measuredSide, Branch<?> secondMeasuredQuadripole, Side secondMeasuredSide, String lib) {
this(dynamicModelId, parameterSetId, measuredQuadripole, measuredSide, secondMeasuredQuadripole, secondMeasuredSide, measuredQuadripole, lib);
Copy link
Contributor

Choose a reason for hiding this comment

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

The fact that the controlled equipment is the first measured quadripole is not very intuitive, shouldn't we force the user to choose a controlled equipment?

Copy link
Contributor

Choose a reason for hiding this comment

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

@gautierbureau what do you think? is that a classical thing that the controlled equipment is the first measured quadripole?

Copy link
Contributor

Choose a reason for hiding this comment

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

As discussed with @gautierbureau, better to make this mandatory. Made that mandatory for basic CLA in the groovy too, to avoid confusion.

...main/groovy/com/powsybl/dynawaltz/dsl/automatons/CurrentLimitAutomatonGroovyExtension.groovy Outdated Show resolved Hide resolved
flo-dup added 4 commits May 26, 2023 16:46
@flo-dup
Revert formatting changes
3b2a5f0 
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@flo-dup
ControlledQuadripole argument mandatory for CLAs
2a2d330 
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@flo-dup
Update unit tests
8eab8f5 
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@flo-dup
Merge branch 'main' into add_cla_two_levels
eda49dc 
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

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

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@flo-dup flo-dup merged commit 283f36f into main May 30, 2023
@flo-dup flo-dup deleted the add_cla_two_levels branch May 30, 2023 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flo-dup flo-dup flo-dup approved these changes

Assignees

@Lisrte Lisrte

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Lisrte @flo-dup