Splitting selection_routines into subfiles #2995
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
neutrinoceros
approved these changes
Dec 15, 2020
Comment on lines
+60
to
+101
| # cdef np.float64_t *arr[2] | ||
| # cdef np.float64_t pos[3] | ||
| # cdef np.float64_t H, D, R2, temp | ||
| # cdef int i, j, k, n | ||
| # cdef int all_under = 1 | ||
| # cdef int all_over = 1 | ||
| # cdef int any_radius = 0 | ||
| # # A moment of explanation (revised): | ||
| # # The disk and bounding box collide if any of the following are true: | ||
| # # 1) the center of the disk is inside the bounding box | ||
| # # 2) any corner of the box lies inside the disk | ||
| # # 3) the box spans the plane (!all_under and !all_over) and at least | ||
| # # one corner is within the cylindrical radius | ||
|
|
||
| # # check if disk center lies inside bbox | ||
| # if left_edge[0] <= self.center[0] <= right_edge[0] and \ | ||
| # left_edge[1] <= self.center[1] <= right_edge[1] and \ | ||
| # left_edge[2] <= self.center[2] <= right_edge[2] : | ||
| # return 1 | ||
|
|
||
| # # check all corners | ||
| # arr[0] = left_edge | ||
| # arr[1] = right_edge | ||
| # for i in range(2): | ||
| # pos[0] = arr[i][0] | ||
| # for j in range(2): | ||
| # pos[1] = arr[j][1] | ||
| # for k in range(2): | ||
| # pos[2] = arr[k][2] | ||
| # H = D = 0 | ||
| # for n in range(3): | ||
| # temp = self.difference(pos[n], self.center[n], n) | ||
| # H += (temp * self.norm_vec[n]) | ||
| # D += temp*temp | ||
| # R2 = (D - H*H) | ||
| # if R2 < self.radius2 : | ||
| # any_radius = 1 | ||
| # if fabs(H) < self.height: return 1 | ||
| # if H < 0: all_over = 0 | ||
| # if H > 0: all_under = 0 | ||
| # if all_over == 0 and all_under == 0 and any_radius == 1: return 1 | ||
| # return 0 |
There was a problem hiding this comment.
any reason we'd want to keep this commented code around ?
There was a problem hiding this comment.
I'll try to remove in a future PR!
neutrinoceros
added
the
refactor
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.
PR Summary
This is an experiment to try to reduce the complexity and file size of the
selection_routines.pyxfile. It doesn't make any changes to it other than to split each selector (and the set of boolean selectors as a group) into their own files.This should make implementing a new selector a bit easier, as it can be templated, and it should also make it much easier if we want to apply templates via
DEFand multipleincludecalls.PR Checklist
black --check yt/isort . --check --diffflake8 yt/flynt yt/ --fail-on-change --dry-run -e yt/extern