Skip to content

Use fewer equality constraints in ortho conn nudging #68

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

Draft
skieffer wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Use fewer equality constraints in ortho conn nudging #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b808a02
Add test case regarding ortho conn nudging
skieffer Sep 2, 2023
1e89b3d
Require equal start pos, for eq constraints
skieffer Sep 2, 2023
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
3 changes: 2 additions & 1 deletion cola/libavoid/orthogonal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2795,7 +2795,8 @@ void ImproveOrthogonalRoutes::nudgeOrthogonalRoutes(size_t dimension,
}
else if (!nudgeSharedPathsWithCommonEnd &&
(m_shared_path_connectors_with_common_endpoints.count(
UnsignedPair(currSegment->connRef->id(), prevSeg->connRef->id())) > 0))
UnsignedPair(currSegment->connRef->id(), prevSeg->connRef->id())) > 0) &&
currSegment->variable->desiredPosition == prevSeg->variable->desiredPosition)
{
// We don't want to nudge apart these two segments
// since they are from a shared path with a common
Expand Down
5 changes: 4 additions & 1 deletion cola/libavoid/tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ check_PROGRAMS = \
nudgingSkipsCheckpoint01 \
nudgingSkipsCheckpoint02 \
hola01 \
hyperedgeRerouting01
hyperedgeRerouting01 \
nudgingNoLeftBdry

# problem_SOURCES = problem.cpp

Expand Down Expand Up @@ -213,5 +214,7 @@ junction02_SOURCES = junction02.cpp
junction03_SOURCES = junction03.cpp
junction04_SOURCES = junction04.cpp

nudgingNoLeftBdry_SOURCES = nudgingNoLeftBdry.cpp

TESTS = $(check_PROGRAMS)

Loading