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

Refactor macro connector & macro connect creation #186

Merged
merged 25 commits into from
Mar 17, 2023
Merged

Refactor macro connector & macro connect creation #186

merged 25 commits into from
Mar 17, 2023

Conversation

Lisrte
Copy link
Contributor

@Lisrte Lisrte commented Mar 9, 2023

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, ...)
Refactor

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

Lisrte and others added 13 commits February 27, 2023 11:38
@Lisrte
Refactor getModelsConnectedTo
8039939 
DynaWaltzContext returns directly the dynamicModel linked to the static id or a default model/exception if not found depending on the method called

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add version of getDynamicModelOrDefaultBus
e3d0fe7 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Change getDynamicModelOrDefaultXXX methods return values after review
c149d61 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add UT
4832d0d 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@flo-dup
Merge branch 'main' into refactor_dynamic_model_connection
8ec75ee 
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@Lisrte
Add BusUtils for searching connectable bus static id
adb3af6 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Fix UT
bf84373 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Remove unused method
e378bf1 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Remove side attribute in Line Model
76c485b 
Add side suffix value in CurrentLimitAutomaton name

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Refactor MacroConnect and MacroConnector creation
0efd8a4 
Handle MacroConnect index
Remove connector commutativity and ConnectedModels
Connect StandardBus only with DefaultModel

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Check if StandardBus connect with DynamicModel or throw exception
44610c4 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte @flo-dup
Refactor MacroConnect and MacroConnector creation
bdc9e38 
Handle MacroConnect index
Remove connector commutativity and ConnectedModels
Connect StandardBus only with DefaultModel

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte @flo-dup
Check if StandardBus connect with DynamicModel or throw exception
642ff0d 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@flo-dup flo-dup force-pushed the refactor_macroconnect_creation branch from 44610c4 to 642ff0d Compare March 10, 2023 14:57
Lisrte added 6 commits March 10, 2023 17:15
@Lisrte
Fix UT
f801048 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Merge remote-tracking branch 'origin/refactor_macroconnect_creation' …
1ed976e 
…into refactor_macroconnect_creation

# Conflicts:
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/StandardLine.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/BusUtils.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynaWaltzTestUtil.java
#	dynawaltz/src/test/resources/dyd.xml
@Lisrte
Fix UT
c5c998d 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Merge branch 'main' into refactor_macroconnect_creation
c595666 
# Conflicts:
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java
#	dynawaltz/src/main/java/com/powsybl/dynawaltz/models/OmegaRef.java
#	dynawaltz/src/test/java/com/powsybl/dynawaltz/models/OmegaRefTest.java
#	dynawaltz/src/test/resources/dyd.xml
@Lisrte
Handle Generator PQ
b026938 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Add UT
da3cb50 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte Lisrte requested a review from flo-dup March 13, 2023 15:56
Lisrte added 3 commits March 14, 2023 15:29
@Lisrte
Create parametrized MacroConnector
da019d2 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Fix CurrentLimitAutomaton
0ee56ba 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Fix UT
7d33ad8 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
flo-dup
flo-dup requested changes Mar 15, 2023
View reviewed changes
Copy link
Contributor

@flo-dup flo-dup left a comment

Choose a reason for hiding this comment

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

Good job, this clarifies things and straightens up responsibilities. A few comments before we can merge

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java Outdated Show resolved Hide resolved
dynawaltz/src/main/java/com/powsybl/dynawaltz/models/OmegaRef.java Outdated Show resolved Hide resolved
dynawaltz/src/main/java/com/powsybl/dynawaltz/models/DefaultModelFactory.java Show resolved Hide resolved
dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java Outdated Show resolved Hide resolved
@Lisrte
Fix OmegaRef et MacroConnect creation
a6a720c 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte
Review fixes
c709535 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
@Lisrte Lisrte requested a review from flo-dup March 17, 2023 12:20
@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 0 Code Smells

98.5% 98.5% Coverage
0.0% 0.0% Duplication

@flo-dup flo-dup merged commit c8ecb55 into main Mar 17, 2023
@flo-dup flo-dup deleted the refactor_macroconnect_creation branch March 17, 2023 13:37
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
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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