Skip to content

Fix nested composite cut operations #841

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

Open
Meklo wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix nested composite cut operations #841

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4776b96
Fix nested composite cut operations
Jun 26, 2026
05db9be
Merge branch 'main' into marcellinh/fix_nested_composite_cut
Meklo Jun 30, 2026
3501bd4
Merge branch 'main' into marcellinh/fix_nested_composite_cut
souissimai Jul 6, 2026
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
6 changes: 3 additions & 3 deletions src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,13 +399,13 @@ public CompletableFuture<NetworkModificationsResult> moveModifications(
Set<UUID> selectedCompositeUuids = modificationRepository.findExistingCompositeModificationIds(modificationsToMoveUuids);

// Get all children of selected composites (to skip sub-modifications that move with their ancestor)
Set<UUID> childrenOfSelectedComposites = selectedCompositeUuids.isEmpty()
Set<UUID> childrenOfSelectedComposites = new HashSet<>(selectedCompositeUuids.isEmpty()
? Set.of()
: new HashSet<>(networkModificationRepository.findAllChildrenUuids(new ArrayList<>(selectedCompositeUuids)));
: new HashSet<>(networkModificationRepository.findAllChildrenUuids(new ArrayList<>(selectedCompositeUuids))));
childrenOfSelectedComposites.removeAll(selectedCompositeUuids);

// Sub-modifications: selected UUIDs that are not composite roots and not already covered by a selected ancestor
List<UUID> subModificationUuids = modificationsToMoveUuids.stream()
.filter(uuid -> !selectedCompositeUuids.contains(uuid))
.filter(uuid -> !childrenOfSelectedComposites.contains(uuid))
.toList();
for (UUID uuid : subModificationUuids) {
Expand Down
Loading