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

Zone diagram (multiple substations) on a substation grid #550

Merged
merged 34 commits into from
Jan 29, 2024
Merged

Zone diagram (multiple substations) on a substation grid #550

merged 34 commits into from
Jan 29, 2024

Conversation

tadam50
Copy link
Contributor

@tadam50 tadam50 commented Sep 26, 2023 •
edited by So-Fras
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)

Does this PR already have an issue describing the problem?
'Fixes #520'

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

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

@tadam50 tadam50 requested a review from So-Fras September 26, 2023 10:02
@tadam50 tadam50 self-assigned this Sep 26, 2023
@tadam50 tadam50 linked an issue Sep 26, 2023 that may be closed by this pull request
Zone diagram (multiple substations) on a substation grid #520
Closed
@tadam50 tadam50 added the SLD label Sep 26, 2023
@tadam50 tadam50 force-pushed the 520-zone-diagram-multiple-substations-on-a-substation-grid branch from be9083e to 8dee2ed Compare September 28, 2023 08:20
@tadam50 tadam50 force-pushed the 520-zone-diagram-multiple-substations-on-a-substation-grid branch from 8dee2ed to 13cd56a Compare October 3, 2023 12:31
@tadam50 tadam50 force-pushed the 520-zone-diagram-multiple-substations-on-a-substation-grid branch 2 times, most recently from 588304c to 5a133e0 Compare October 23, 2023 15:07
@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 3 Code Smells

82.9% 82.9% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

So-Fras
So-Fras reviewed Oct 27, 2023
View reviewed changes
...-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/MatrixZoneLayout.java Outdated Show resolved Hide resolved
...-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/Grid.java Outdated Show resolved Hide resolved
...-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/Grid.java Outdated Show resolved Hide resolved
...-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/Grid.java Outdated Show resolved Hide resolved
...-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/Grid.java Outdated Show resolved Hide resolved
...-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/MatrixZoneLayout.java Outdated Show resolved Hide resolved
...-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/MatrixZoneLayout.java Outdated Show resolved Hide resolved
...line-diagram-core/src/main/java/com/powsybl/sld/layout/zonebygrid/MatrixZoneLayoutModel.java Outdated Show resolved Hide resolved
...e-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/DijkstraPathFinder.java Outdated Show resolved Hide resolved
...e-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/DijkstraPathFinder.java Show resolved Hide resolved
So-Fras
So-Fras requested changes Oct 27, 2023
View reviewed changes
Copy link
Member

@So-Fras So-Fras 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 the huge work so far!
I left some remarks. I did not go through the DijkstraPathFinder class thoroughly though, I keep it for another time :)

...e-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/DijkstraPathFinder.java Show resolved Hide resolved
...diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/Point.java Outdated Show resolved Hide resolved
...diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/Point.java Outdated Show resolved Hide resolved
...-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/MatrixZoneLayout.java Outdated Show resolved Hide resolved
@tadam50 tadam50 force-pushed the 520-zone-diagram-multiple-substations-on-a-substation-grid branch from c85f848 to 8da9d05 Compare November 30, 2023 12:36
@tadam50 tadam50 force-pushed the 520-zone-diagram-multiple-substations-on-a-substation-grid branch from cd7338e to 36a6d98 Compare December 13, 2023 10:29
@tadam50 tadam50 force-pushed the 520-zone-diagram-multiple-substations-on-a-substation-grid branch from f82cc44 to 799c043 Compare January 16, 2024 15:52
@tadam50 tadam50 marked this pull request as ready for review January 17, 2024 13:11
@tadam50 tadam50 requested a review from So-Fras January 17, 2024 13:11
@So-Fras So-Fras requested a review from flo-dup January 18, 2024 14:20
@tadam50 tadam50 force-pushed the 520-zone-diagram-multiple-substations-on-a-substation-grid branch from 4204e88 to 0e895c5 Compare January 29, 2024 09:51
tadam50 added 23 commits January 29, 2024 16:25
@tadam50
Refactor + make unavailable previous snakeline
a6318ed 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Documentation
9f19897 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Documentation: english
08a06ef 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Increase code coverage
6b34186 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Increase code coverage + cleaning code
1f502cd 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Update documentation
f0f40f6 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Set with & height zone graph without diagram padding
ce0a926 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Use com.powsybl.sld.model.coordinate.Point class
254e36b 
Use smoothPath method to reduce snakeline point list

Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Taking into account PR comments
dbc5735 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Replace Vertical and Horizontal ZoneLayout by MatrixZoneLayout
88ba4b1 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Fix sonar issues
0b70fb4 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Put snakeline margin into LayoutParameters
2dba3fc 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Add path finder type into LayoutParameters
98383ed 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Height is computated by row & width is computed by column
1b65ea7 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Fix code smells
fe3a0dc 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Taking into account PR comments : refactor path finder parametrized +…
f483a33 
… code smell

Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Taking into account PR comments : remove Dijskra factory
cf9c5cc 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Separate availability & cost into Grid.Node
1e43767 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Fix bad computation of path finder grid
46b5fc9 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Center substation into own matrix cell
16e5f24 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Fix code style
0d8a9ad 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Update tests files
7591084 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50
Improve snakeline available path from stating point
ffcec64 
Signed-off-by: Thomas ADAM <[email protected]>
@tadam50 tadam50 force-pushed the 520-zone-diagram-multiple-substations-on-a-substation-grid branch from d831d26 to ffcec64 Compare January 29, 2024 15:25
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

The SonarCloud Quality Gate passed, but some issues were introduced.

2 New issues
0 Security Hotspots
96.4% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@So-Fras So-Fras mentioned this pull request Jan 29, 2024
Closed
So-Fras
So-Fras approved these changes Jan 29, 2024
View reviewed changes
Copy link
Member

@So-Fras So-Fras 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 @tadam50 for the huge amount of work you put in this PR. Even though there are some glitches that we know we have to take care of in our next releases, it is great that we can offer this new feature for our users to test out.

@So-Fras So-Fras merged commit fb77b1b into main Jan 29, 2024
6 checks passed
@So-Fras So-Fras deleted the 520-zone-diagram-multiple-substations-on-a-substation-grid branch January 29, 2024 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@So-Fras So-Fras So-Fras approved these changes

@flo-dup flo-dup Awaiting requested review from flo-dup

Assignees

@tadam50 tadam50

Labels
SLD
Projects
4.2.0
Status: Done
V4.1.0
Status: In progress
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Zone diagram (multiple substations) on a substation grid
2 participants
@tadam50 @So-Fras