U/jrbogart/gaia slice #95
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
jchiang87
approved these changes
May 8, 2024
skycatalogs/objects/gaia_object.py
Outdated
| ixdata = [i for i in range(min(key.stop, len(self._id)))] | ||
| ixdata = [i for i in range(min(key.stop, len(self.df['id'])))] | ||
| ixes = itertools.islice(ixdata, key.start, key.stop, key.step) | ||
| return [self._object_class(self.df.iloc[i], self, i) for i in ixes] | ||
| return [self.__getitem__(i) for i in ixes] |
There was a problem hiding this comment.
I suppose this is fine, but it seems that the reason to use itertools.islice would be to avoid creating the ixdata list to begin with. The following should be equivalent, is clearer (to me at least), and also avoids creating an intermediate list.
return [self.__getitem__(i) for i in range(len(self.df))[key]]
There was a problem hiding this comment.
Agreed. There is similar code in base_object.py and sso_object.py. I will update them similarly in upcoming commit.
skycatalogs/objects/gaia_object.py
Outdated
| 'dec_deg', | ||
| 'phot_bp_mean_flux', | ||
| 'phot_rp_mean_flux')} | ||
| row = {col: self.df[col][key] for col in cols} | ||
| return GaiaObject(row, self, key) | ||
|
|
||
| elif type(key) == slice: |
There was a problem hiding this comment.
Any reason not to use isinstance(key, slice) here?
There was a problem hiding this comment.
No reason. I'll change it.
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.
Fix code for retrieval of a GaiaCollection slice. It's unlikely anyone has or will use it, but, since GaiaCollection subclasses Sequence, it should handle this case.