Rework enum #8
Merged
Rework enum #8
Conversation
This file contains hidden or 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
Hartorn
force-pushed
the
rework-enum
branch
2 times, most recently
from
6d46ff3 to
39a4a52
Compare
rabah-khalek
approved these changes
Dec 20, 2023
Contributor
rabah-khalek
left a comment
rabah-khalek
left a comment
There was a problem hiding this comment.
Great work @Hartorn, quite an improvement and I particularly like the operators extension to the names.
I left some comments for the future, particularly the direction of using https://numpy.org/doc/stable/reference/maskedarray.generic.html to define a new "marks" class that already support masks (our facial_parts) with all the native ops and validations numpy.ma has.
Comment on lines
-8
to
-19
| class FacialPart(NDArrayOperatorsMixin): | ||
| part: np.ndarray | ||
| name: str = "" | ||
|
|
||
| def __add__(self, o): | ||
| return FacialPart(np.unique(np.concatenate((self.part, o.part)))) | ||
|
|
||
| def __sub__(self, o): | ||
| return FacialPart(np.setxor1d(self.part, np.intersect1d(self.part, o.part))) | ||
|
|
||
| def __array__(self): | ||
| return self.part |
Contributor
There was a problem hiding this comment.
Inheriting from NDArrayOperatorsMixin and having __array__ would avoid us having crop_mark
Comment on lines
18
to
23
| def crop_mark(mark: np.ndarray, part: FacialPart, exclude=False): | ||
| idx = np.isin(FacialParts.entire, part) | ||
| if not exclude: | ||
| idx = ~idx | ||
| part = ~part | ||
| res = mark.copy() | ||
| res[idx, :] = np.nan | ||
| res[part.idx, :] = np.nan | ||
| return res |
Contributor
There was a problem hiding this comment.
Reflecting on all this, I think https://numpy.org/doc/stable/reference/maskedarray.generic.html could be the most suited for our case.
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.
No description provided.