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.

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

Jump to bottom

Add new test result to test_asadpour_tsp and change linprog method #7335

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Add new test result to test_asadpour_tsp and change linprog method #7335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions networkx/algorithms/approximation/tests/test_traveling_salesman.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,9 +756,15 @@ def fixed_asadpour(G, weight):
# the shortest path between those vertices, allowing vertices to appear more
# than once.
#
# However, we are using a fixed random number generator so we know what the
# expected tour is.
expected_tours = [[1, 4, 5, 0, 2, 3, 2, 1], [3, 2, 0, 1, 4, 5, 3]]
# Even though we are using a fixed seed, multiple tours have been known to
# be returned. The first two are from the original delevopment of this test,
# and the third one from issue #5913 on GitHub. If other tours are returned,
# add it on the list of expected tours.
expected_tours = [
[1, 4, 5, 0, 2, 3, 2, 1],
[3, 2, 0, 1, 4, 5, 3],
[3, 2, 1, 0, 5, 4, 3],
]

assert tour in expected_tours

Expand Down
4 changes: 3 additions & 1 deletion networkx/algorithms/approximation/traveling_salesman.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,9 @@ def direction_of_ascent():
a_eq[n_count][arb_count] = deg - 2
n_count -= 1
a_eq[len(G)][arb_count] = 1
program_result = optimize.linprog(c, A_eq=a_eq, b_eq=b_eq)
program_result = optimize.linprog(
c, A_eq=a_eq, b_eq=b_eq, method="highs-ipm"
)
# If the constants exist, then the direction of ascent doesn't
if program_result.success:
# There is no direction of ascent
Expand Down