-
Notifications
You must be signed in to change notification settings - Fork 79
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
support cliques as a resolver of coincident points in Graph #647
Conversation
The issue, as far as I remember it, was that |
I think there was an issue after a bad rebase. I can get some attention on it this week to fix. |
I'm pretty certain that the issue was induced when we switched from focal-indexed adjacency to non-indexed adjacency.. @knaaptime, I've sent a PR to your clique branch with the change. The dual merge in lines 76-82 was supposed to match up the deduped ids back onto the clique ids, and then explode the cliques into their own links. This only works when the With this fix, tests still fail, but I think the test answers are incorrect? In the tests, 0 and 4 are coincident, and the current answers are: exp_heads = np.array(
[0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5]
)
exp_tails = np.array(
[1, 2, 4, 0, 2, 3, 4, 5, 0, 1, 3, 1, 2, 5, 0, 1, 5, 1, 3, 4]
) But, if 0 and 4 are coincident, then every link and backlink containing 0 should also contain 4. So, for example, link exp_heads = numpy.array([0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5,
5, 5])
exp_tails = numpy.array([1, 2, 4, 5, 0, 2, 3, 4, 5, 0, 1, 3, 4, 1, 2, 5, 0, 1, 2, 5, 0, 1,
3, 4]) The |
OK, after some further testing, I think I've confirmed the answers need to change, but I had to make sure to re-set the working values (like, I will change the tests, but the correct edge table is in the comment above. |
This now also addresses #573. The fix was as described, but also exposed a few other minor issues in the implementation that have been fixed. |
Triangulation is done. I'm now verifying the usage in |
|
This is ready for review. |
Could it be some issue with your local env? It seems to be work as expected on CI. We have some issue with coincident points in the env with the minimum supported versions of dependencies for some reason... |
then it must be something in my local environment. I will check out the failures in py3.10. I think that's likely a numba issue. |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #647 +/- ##
=======================================
+ Coverage 84.5% 85.0% +0.6%
=======================================
Files 139 139
Lines 14972 14868 -104
=======================================
- Hits 12647 12642 -5
+ Misses 2325 2226 -99
|
Tests are passing, ready for review! |
@knaaptime I can't assign you as a reviewer, but you probably should be one of the reviewers anyway, having motivated me to revisit this 😄 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you rule. But i also cant approve, apparently, since it's technically "my" pr
so, approved. :P
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can approve :)
i think we were just missing a couple parens