Skip to content

Commit

Permalink
Taking into account PR comments
Browse files Browse the repository at this point in the history 
Signed-off-by: Thomas ADAM <[email protected]>
  • Loading branch information
@tadam50
tadam50 committed Jan 16, 2024
1 parent 93b7635 commit 0e1a50f
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 46 deletions.
15 changes: 6 additions & 9 deletions ...agram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/MatrixZoneLayout.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ protected void calculateCoordSubstations(LayoutParameters layoutParameters) {
} else if (!id.isEmpty()) {
throw new PowsyblException("Substation '" + id + "' was not found in zone graph '" + getGraph().getId() + "'");
}
model.addGraph(graph, col, row);
model.addSubstationSubgraph(graph, col, row);
}
}
// Height by rows
int maxHeightRow = model.getMatrixCellHeight();
// Width by col
int maxWidthCol = model.getMatrixCellWidth();
// Snakeline hallway
int hallway = model.getSnakelineHallwayWidth();
// Snakeline hallway (horizontal & vertical)
int hallway = model.getSnakelineMargin();
// Zone size
int nbRows = matrix.length;
int nbCols = matrix[0].length;
Expand Down Expand Up @@ -89,22 +89,19 @@ protected List<Point> calculatePolylineSnakeLine(LayoutParameters layoutParam, P
VoltageLevelGraph vlGraph2 = getGraph().getVoltageLevelGraph(node2);
SubstationGraph ss1Graph = getGraph().getSubstationGraph(node1).orElse(null);
SubstationGraph ss2Graph = getGraph().getSubstationGraph(node2).orElse(null);
if (ss1Graph != null && ss1Graph == ss2Graph) { // in the same Substation
polyline = layoutBySubstation.get(ss1Graph).calculatePolylineSnakeLine(layoutParam, nodes, increment);
} else if (ss1Graph != null && ss2Graph != null &&
model.contains(ss1Graph.getId()) && model.contains(ss2Graph.getId())) { // in the same Zone
if (ss1Graph != null && ss2Graph != null &&
model.contains(ss1Graph.getId()) && model.contains(ss2Graph.getId())) { // in the same Zone
Point p1 = vlGraph1.getShiftedPoint(node1);
Point p2 = vlGraph2.getShiftedPoint(node2);
Direction dNode1 = getNodeDirection(node1, 1);
Direction dNode2 = getNodeDirection(node2, 2);
polyline = new ArrayList<>();
// Add starting point
polyline.add(p1);
// Find snakeline path
polyline.addAll(model.buildSnakeline(pathFinder, p1, dNode1, p2, dNode2));
// Add ending point
polyline.add(p2);
} else {
// Not specified in matrix by user
}
return polyline;
}
Expand Down
1 change: 1 addition & 0 deletions ...ine-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/DijkstraPathFinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public List<Point> findShortestPath(Grid grid, Point start, Point goal) {
}
}
}
// No path found
return new ArrayList<>();
}

Expand Down
2 changes: 1 addition & 1 deletion ...agram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/pathfinding/Grid.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public boolean isAvailable(Node n) {
}

public boolean isAvailable(Point point) {
return point.getX() >= 0 && point.getX() < width && point.getY() >= 0 && point.getY() < height && nodes[(int) point.getX()][(int) point.getY()].cost != -1;
return point.getX() >= 0 && point.getX() < width && point.getY() >= 0 && point.getY() < height && nodes[(int) point.getX()][(int) point.getY()].cost != NOT_WALKABLE;
}

protected List<Node> getNeighbors(Point point) {
Expand Down
60 changes: 24 additions & 36 deletions ...e-diagram-core/src/main/java/com/powsybl/sld/layout/zonebygrid/MatrixZoneLayoutModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ public class MatrixZoneLayoutModel {

private int matrixCellWidth = -1;

private final int snakelineHallwayWidth;
private final int snakelineMargin;

private Grid pathFinderGrid;

public MatrixZoneLayoutModel(int hallway) {
this.snakelineHallwayWidth = hallway;
this.snakelineMargin = hallway;
}

public void addGraph(SubstationGraph graph, int col, int row) {
public void addSubstationSubgraph(SubstationGraph graph, int col, int row) {
if (graph != null) {
cellsById.put(graph.getId(), new MatrixCell(graph, col, row));
matrixCellHeight = Math.max(matrixCellHeight, (int) graph.getHeight());
Expand All @@ -51,8 +51,8 @@ public void addGraph(SubstationGraph graph, int col, int row) {
matrixNbCol = Math.max(matrixNbCol, col + 1);
}

public int getSnakelineHallwayWidth() {
return snakelineHallwayWidth;
public int getSnakelineMargin() {
return snakelineMargin;
}

public int getMatrixCellWidth() {
Expand All @@ -63,48 +63,35 @@ public int getMatrixCellHeight() {
return matrixCellHeight;
}

public int getX(int col) {
return ((col + 1) * snakelineHallwayWidth) + (col * matrixCellWidth);
private int getX(int col) {
return ((col + 1) * snakelineMargin) + (col * matrixCellWidth);
}

public int getY(int row) {
return getY(row, Direction.TOP);
}

public int getY(int row, Direction direction) {
return (row + 1) * snakelineHallwayWidth + (row + (direction == Direction.TOP ? 0 : 1)) * matrixCellHeight;
private int getY(int row) {
return (row + 1) * snakelineMargin + row * matrixCellHeight;
}

public List<Point> buildSnakeline(PathFinder pathfinder,
Point p1, Direction d1,
Point p2, Direction d2) {
insertFreePathInSubstation(p1, d1, p2, d2);
insertFreePathInSubstation(p1, d1);
insertFreePathInSubstation(p2, d2);

// Use path finding algo
return pathfinder.findShortestPath(pathFinderGrid, p1, p2);
}

private void insertFreePathInSubstation(Point p1, Direction d1,
Point p2, Direction d2) {
private void insertFreePathInSubstation(Point p, Direction d) {
int dy = 1;

int x1 = (int) p1.getX();
int y1 = (int) p1.getY();
int ss1Y = y1 + snakelineHallwayWidth * (d1 == Direction.TOP ? -1 : 1);
int x1 = (int) p.getX();
int y1 = (int) p.getY();
int ss1Y = y1 + snakelineMargin * (d == Direction.TOP ? -1 : 1);
int min1Y = Math.max(Math.min(y1, ss1Y), 0);
int max1Y = Math.max(y1, ss1Y) + dy;
for (int y = min1Y; y < max1Y; y++) {
pathFinderGrid.setAvailability(x1, y, true);
}

int x2 = (int) p2.getX();
int y2 = (int) p2.getY();
int ss2Y = y2 + snakelineHallwayWidth * (d2 == Direction.TOP ? -1 : 1);
int min2Y = Math.max(Math.min(y2, ss2Y), 0);
int max2Y = Math.max(y2, ss2Y) + dy;
for (int y = min2Y; y < max2Y; y++) {
pathFinderGrid.setAvailability(x2, y, true);
}
}

public void computePathFindingGrid(ZoneGraph graph, LayoutParameters layoutParameters) {
Expand Down Expand Up @@ -148,17 +135,18 @@ private void computeSubstationsAvailability(LayoutParameters layoutParameters) {

private void computeMatrixCellsAvailability(LayoutParameters layoutParameters) {
List<MatrixCell> allCells = new ArrayList<>(cellsById.values().stream().toList());
// Make empty cells available for snakeline computation
allCells.addAll(emptyCells);
allCells.forEach(cell -> {
int ssX = getX(cell.col());
int ssY = getY(cell.row());
for (int x = ssX - snakelineHallwayWidth; x < ssX - snakelineHallwayWidth + matrixCellWidth + snakelineHallwayWidth; x++) {
for (int y = ssY - snakelineHallwayWidth; y < ssY - snakelineHallwayWidth + matrixCellHeight + snakelineHallwayWidth; y += layoutParameters.getHorizontalSnakeLinePadding()) {
for (int x = ssX - snakelineMargin; x < ssX - snakelineMargin + matrixCellWidth + snakelineMargin; x++) {
for (int y = ssY - snakelineMargin; y < ssY - snakelineMargin + matrixCellHeight + snakelineMargin; y += layoutParameters.getHorizontalSnakeLinePadding()) {
pathFinderGrid.setAvailability(x, y, true);
}
}
for (int x = ssX - snakelineHallwayWidth; x < ssX - snakelineHallwayWidth + matrixCellWidth + snakelineHallwayWidth; x += layoutParameters.getVerticalSnakeLinePadding()) {
for (int y = ssY - snakelineHallwayWidth; y < ssY - snakelineHallwayWidth + matrixCellHeight + snakelineHallwayWidth; y++) {
for (int x = ssX - snakelineMargin; x < ssX - snakelineMargin + matrixCellWidth + snakelineMargin; x += layoutParameters.getVerticalSnakeLinePadding()) {
for (int y = ssY - snakelineMargin; y < ssY - snakelineMargin + matrixCellHeight + snakelineMargin; y++) {
pathFinderGrid.setAvailability(x, y, true);
}
}
Expand All @@ -168,8 +156,8 @@ private void computeMatrixCellsAvailability(LayoutParameters layoutParameters) {
private void computeHorizontalHallwaysAvailability(int width, int height, LayoutParameters layoutParameters) {
for (int r = 0; r < matrixNbRow; r++) {
for (int x = 0; x < width; x++) {
for (int hy = 0; hy < height; hy += snakelineHallwayWidth + matrixCellHeight) {
for (int y = hy; y < hy + snakelineHallwayWidth; y += layoutParameters.getHorizontalSnakeLinePadding()) {
for (int hy = 0; hy < height; hy += snakelineMargin + matrixCellHeight) {
for (int y = hy; y < hy + snakelineMargin; y += layoutParameters.getHorizontalSnakeLinePadding()) {
pathFinderGrid.setAvailability(x, y, true);
}
}
Expand All @@ -180,8 +168,8 @@ private void computeHorizontalHallwaysAvailability(int width, int height, Layout
private void computeVerticalHallwaysAvailability(int width, int height, LayoutParameters layoutParameters) {
for (int c = 0; c < matrixNbCol; c++) {
for (int y = 0; y < height; y++) {
for (int hx = 0; hx < width; hx += snakelineHallwayWidth + matrixCellWidth) {
for (int x = hx; x < hx + snakelineHallwayWidth; x += layoutParameters.getVerticalSnakeLinePadding()) {
for (int hx = 0; hx < width; hx += snakelineMargin + matrixCellWidth) {
for (int x = hx; x < hx + snakelineMargin; x += layoutParameters.getVerticalSnakeLinePadding()) {
pathFinderGrid.setAvailability(x, y, true);
}
}
Expand Down

0 comments on commit 0e1a50f

Please sign in to comment.