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

fix of router hanging #2282 #2619

Merged
merged 5 commits into from
Dec 6, 2019
Merged

fix of router hanging #2282 #2619

merged 5 commits into from
Dec 6, 2019

Conversation

askolik
Copy link
Contributor

@askolik askolik commented Dec 4, 2019

When generating candidate swaps to perform for the next set of operations to apply, the routing algorithm only checked if there is a candidate swap. It did not check if performing this swap will lead to a new adjacent connection in the graph, considering the max_search_radius. This leads to the algorithm being stuck in an infinite loop for some graph instances, where it keeps performing swaps that don't lead to adjacent connections for the remaining operations.

Fixed this by adding a check for adjacent connections in the new graph, and if there are no new adjacent connections, perform the swap that brings together the farthest nodes.

Fixes: #2282

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@askolik
Copy link
Contributor Author

askolik commented Dec 4, 2019

@googlebot I fixed it.

@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: yes Makes googlebot stop complaining. and removed cla: no labels Dec 4, 2019
Copy link
Collaborator

@vtomole vtomole left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll merge once the build passes.

@bryano bryano merged commit 6d81ddb into quantumlib:master Dec 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Makes googlebot stop complaining.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

contrib.routing algorithm hangs
4 participants