Improvements to forceatlas2 algorithm #488
Merged
Conversation
This file contains 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
jbednar
reviewed
Oct 5, 2017
datashader/layout.py
Outdated
| nlen = len(nodes) | ||
| if 'id' in nodes: | ||
| index = dict(zip(nodes['id'].values, range(nlen))) | ||
| else: | ||
| index = dict(zip(nodes.index.values, range(nlen))) | ||
|
|
||
| if 'weight' not in edges: | ||
| if params.ignore_weights or 'weight' not in edges: | ||
| edges = edges.copy() | ||
| edges['weight'] = np.ones(len(edges)) |
There was a problem hiding this comment.
This seems like a very expensive step, and doesn't seem feasible as an approach in general, but I guess we can merge and come back to that later.
Instead of copying the dataframe and creating another single-value column if the weights are ignored, we use an if-statement to specify the default weight.
Creating a temporary list of tuples that are immediately thrown away is redundant and wasteful.
|
After profiling the memory usage for sparse matrix creation, it surprisingly turned out that removing the temporary tuple list had a far larger impact than the updated steps taken when ignoring weights. The overall time didn't change noticeably in either case. |
|
Ok, sounds great! I'll merge when tests pass. |
jbednar
pushed a commit
that referenced
this pull request
Oct 30, 2017
* Replace constants with parameters * Check for loops * Optionally ignore weights during layout
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The datatype of the coordinates is now consistent. We also check for edges pointing to themselves.
Related to #485