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

DynaWaltz: Line model #147

Merged
merged 16 commits into from
Feb 3, 2023
Merged

DynaWaltz: Line model #147

merged 16 commits into from
Feb 3, 2023

Conversation

dimbdr
Copy link
Contributor

@dimbdr dimbdr commented Dec 23, 2022

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)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Introduce Line model

BAUDRIER Dimitri added 5 commits December 22, 2022 15:56
Add Line model
2fd1ab4 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
Line update
8ce7c87 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
Rename
66a2e13 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
Do not include Automaton via the lines.
8db5466 
Modified test, we create StandardBus on NHV1 and NHV2 static buses instead of NGEN.
It is needed to exploit the lines between theses two buses.

Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
Forgot to put xml attributes for StandardLine
1773242 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
@dimbdr dimbdr changed the title Line2 DynaWaltz: Line model Dec 23, 2022
Correct checkstyle
78ca772 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
flo-dup
flo-dup requested changes Jan 4, 2023
View reviewed changes
Copy link
Contributor

@flo-dup flo-dup left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Similarly to the bus model, could you also add a LineGroovyExtension in dynawaltz-dsl?

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/CurrentLimitAutomaton.java Outdated Show resolved Hide resolved
dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/StandardLine.java Outdated Show resolved Hide resolved
dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/StandardLine.java

@Override
public List<VarMapping> getVarsMapping() {
return Collections.emptyList();
Copy link
Contributor

Choose a reason for hiding this comment

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

I would expect that some static vars correspond to dynamic vars, why isn't it the case? @gautierbureau

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Honestly I don't know.
I made this development according to this example : https://github.com/dynawo/dynawo/blob/master/nrt/data/SMIB/SMIB_BasicTestCases/SMIB_1_StepPm_IIDM/SMIB.dyd

I didn't find any dyd file that describes a line with macroconnectors. So for now, I just assumed there's no varsMapping.

Copy link
Contributor

Choose a reason for hiding this comment

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

Indeed, none so far

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/StandardLine.java Outdated

@Override
public void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException {
writer.writeStartElement(DYN_URI, "blackBoxModel");
Copy link
Contributor

Choose a reason for hiding this comment

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

why did you override this, it's because there's no macro static reference?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, but I might be wrong on this.

Copy link
Contributor

Choose a reason for hiding this comment

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

Better reuse the write of AbstractBlackBoxModel

BAUDRIER Dimitri added 6 commits January 5, 2023 11:07
Merge branch 'main' into line2
108d382
Reuse of writeDynamicAttributes in overriden write method
ae2a70e 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
Delete useless id, dynamicId is enough
419f42f 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
Rename methods in CurrentLimitAutomaton
f11e90f 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
Correct checkstyle
1a7eefa 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
Add LineGroovyExtension into DSL
46742b0 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
@dimbdr dimbdr requested a review from flo-dup January 5, 2023 14:38
BAUDRIER Dimitri and others added 4 commits January 5, 2023 16:52
Fixed documentation of LineGroovyExtension
4517fe7 
Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
@flo-dup
Merge branch 'main' into line2
fe4a2c6
@flo-dup
Fix code smells
f588c26 
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@flo-dup
Factorize code
cbfab40 
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@sonarqubecloud
Copy link

sonarqubecloud bot commented Feb 3, 2023

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

89.2% 89.2% Coverage
0.0% 0.0% Duplication

@flo-dup flo-dup merged commit f504d38 into main Feb 3, 2023
@flo-dup flo-dup deleted the line2 branch February 3, 2023 17:12
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

@gautierbureau gautierbureau Awaiting requested review from gautierbureau

Assignees
No one assigned
Labels
PR: waiting-for-correction
Projects
None yet
Milestone
No milestone
Development

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