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.

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

[SLD] Fix duplicate ids #488

Merged
merged 2 commits into from
Jan 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ private void insertBusConnections(BusNode busNode, Predicate<Node> nodesOnBus) {
}

private void insertBusConnection(BusNode busNode, Node nodeConnectedToBusNode) {
Node fNodeToBus = NodeFactory.createBusConnection(this, nodeConnectedToBusNode.getId());
Node fNodeToBus = NodeFactory.createBusConnection(this, busNode.getId() + "_" + nodeConnectedToBusNode.getId());
insertNode(busNode, fNodeToBus, nodeConnectedToBusNode);
}

Expand Down Expand Up @@ -329,7 +329,7 @@ private void insertHookNodesAtBuses(BusNode busNode) {

private void insertBusHookNode(Node nodeOnBus, Node node) {
// Create hook node
Node fStackNode = NodeFactory.createConnectivityNode(this, node.getId());
Node fStackNode = NodeFactory.createConnectivityNode(this, nodeOnBus.getId() + "-" + node.getId());

// Update edges
if (node.getType() == NodeType.FEEDER) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ public void test() {
assertTrue(sb.getSubBlocks().get(2).isEmbeddingNodeType(FEEDER));

assertEquals("bbs", sb.getSubBlocks().get(0).getStartingNode().getId());
assertEquals("INTERNAL_vl_ba", sb.getSubBlocks().get(0).getEndingNode().getId());
assertEquals("INTERNAL_vl_ba", sb.getSubBlocks().get(1).getStartingNode().getId());
assertEquals("INTERNAL_vl_da-ba", sb.getSubBlocks().get(0).getEndingNode().getId());
assertEquals("INTERNAL_vl_da-ba", sb.getSubBlocks().get(1).getStartingNode().getId());
assertEquals("INTERNAL_vl_la", sb.getSubBlocks().get(1).getEndingNode().getId());
assertEquals("INTERNAL_vl_la", sb.getSubBlocks().get(2).getStartingNode().getId());
assertEquals("la", sb.getSubBlocks().get(2).getEndingNode().getId());
Expand Down Expand Up @@ -127,11 +127,11 @@ public void test() {
sb.reverseBlock();

// LegPrimaryBlock is NOT reversed (bus is always the starting node)
assertEquals("INTERNAL_vl_ba", sb.getSubBlocks().get(1).getEndingNode().getId());
assertEquals("INTERNAL_vl_da-ba", sb.getSubBlocks().get(1).getEndingNode().getId());
assertEquals("bbs", sb.getSubBlocks().get(2).getStartingNode().getId());

// BodyPrimaryBlock is reversed
assertEquals("INTERNAL_vl_ba", sb.getSubBlocks().get(1).getEndingNode().getId());
assertEquals("INTERNAL_vl_da-ba", sb.getSubBlocks().get(1).getEndingNode().getId());
assertEquals("INTERNAL_vl_la", sb.getSubBlocks().get(1).getStartingNode().getId());

// FeederPrimaryBlock is NOT reversed (feeder is always the ending node)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ public void test() {

sb.reverseBlock();

assertEquals("INTERNAL_vl_ba", sb.getEndingNode().getId());
assertEquals("INTERNAL_vl_ba", subSB.getEndingNode().getId());
assertEquals("INTERNAL_vl_da-ba", sb.getEndingNode().getId());
assertEquals("INTERNAL_vl_da-ba", subSB.getEndingNode().getId());
assertEquals("INTERNAL_vl_2", subPB.getSubBlocks().get(1).getEndingNode().getId());
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading