Added Group Model Order thesis strategies #1147
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored by: Max Riepe <[email protected]>
This counts how many model order nodes are there to properly partition them.
This supports group model order.
Removed unnecessary strategies. Added comments, and fixed the scc cycle breakers.
There was a problem hiding this comment.
Pull Request Overview
This PR extends the ELK layered layout algorithm to support group model order strategies for both cycle breaking and crossing minimization phases. The changes enable users to define ordering groups that can be enforced or used as partial ordering constraints beyond simple model order.
- Adds group model order support to cycle breaking strategies with new SCC-based approaches
- Integrates group model order into crossing minimization with configurable enforcement strategies
- Introduces new cycle breaking algorithms (DFS/BFS node order, SCC connectivity/node type) that respect group ordering
Reviewed Changes
Copilot reviewed 21 out of 21 changed files in this pull request and generated 8 comments.
Show a summary per file
| File | Description |
|---|---|
| ModelOrderBarycenterHeuristic.java | Updates comparator to use group model order calculation with configurable enforcement |
| LayerSweepCrossingMinimizer.java | Adds group order strategy parameters to model order counting methods |
| SCConnectivity.java | New SCC-based cycle breaker using connectivity heuristics with group model order |
| SCCNodeTypeCycleBreaker.java | New SCC cycle breaker with preferred node type selection and group ordering |
| SCCModelOrderCycleBreaker.java | Abstract base class for SCC-based cycle breaking with group model order support |
| ModelOrderCycleBreaker.java | Refactored to use shared GroupModelOrderCalculator with group ordering support |
| GroupModelOrderCalculator.java | New utility class for calculating model order vs group model order with constraints |
| GreedyModelOrderCycleBreaker.java | Updated to support group model order in node selection heuristics |
| DFSNodeOrderCycleBreaker.java | New DFS-based cycle breaker using node model order for traversal ordering |
| BFSNodeOrderCycleBreaker.java | New BFS-based cycle breaker using node model order for traversal ordering |
| InternalProperties.java | Adds properties for tracking max model order, group counts, and Tarjan algorithm state |
| GroupOrderStrategy.java | New enum defining group ordering enforcement strategies |
| CycleBreakingStrategy.java | Extended with new cycle breaking strategy options supporting group model order |
| ModelOrderPortComparator.java | Updated to use group model order calculation in port comparison logic |
| ModelOrderNodeComparator.java | Enhanced with group order strategy support and improved edge handling |
| CMGroupModelOrderCalculator.java | New utility for crossing minimization group model order calculations |
| SortByInputModelProcessor.java | Updated to pass group order strategy to comparators |
| ElkGraphImporter.java | Enhanced to track group model order statistics during graph import |
| Tarjan.java | New implementation of Tarjan's algorithm for strongly connected component detection |
| Layered.melk | Adds configuration options for group model order strategies and enforcement |
...ipse.elk.alg.layered/src/org/eclipse/elk/alg/layered/p1cycles/GroupModelOrderCalculator.java
Outdated
Show resolved
Hide resolved
...lipse.elk.alg.layered/src/org/eclipse/elk/alg/layered/p1cycles/BFSNodeOrderCycleBreaker.java
Outdated
Show resolved
Hide resolved
...ipse.elk.alg.layered/src/org/eclipse/elk/alg/layered/p1cycles/SCCModelOrderCycleBreaker.java
Outdated
Show resolved
Hide resolved
...ins/org.eclipse.elk.alg.layered/src/org/eclipse/elk/alg/layered/p1cycles/SCConnectivity.java
Outdated
Show resolved
Hide resolved
…yered/p1cycles/GroupModelOrderCalculator.java Co-authored-by: Copilot <[email protected]> Signed-off-by: Sören Domrös <[email protected]>
…yered/p1cycles/BFSNodeOrderCycleBreaker.java Co-authored-by: Copilot <[email protected]> Signed-off-by: Sören Domrös <[email protected]>
…yered/p1cycles/SCCModelOrderCycleBreaker.java Co-authored-by: Copilot <[email protected]> Signed-off-by: Sören Domrös <[email protected]>
…yered/p1cycles/SCConnectivity.java Co-authored-by: Copilot <[email protected]> Signed-off-by: Sören Domrös <[email protected]>
|
Fixes #952 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.