py: ParticleSlice fixes #3367
Merged
py: ParticleSlice fixes #3367
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
Codecov Report
@@ Coverage Diff @@
## python #3367 +/- ##
======================================
Coverage 86% 86%
======================================
Files 537 537
Lines 25283 25283
======================================
Hits 21806 21806
Misses 3477 3477Continue to review full report at Codecov.
|
|
@KaiSzuttor, based on the offline discussion, I inserted a few comments which hopefully make things more clear |
KaiSzuttor
suggested changes
Dec 10, 2019
| self.id_selection = np.array(slice_, dtype=int) | ||
| else: | ||
| raise TypeError( | ||
| "ParticleSlice must be initialized with an instance of slice or range, or with a list, tuple, or ndarray of ints, but got " + |
There was a problem hiding this comment.
we should probably use "some string {}".format(some_variable)
| @@ -2026,8 +2048,7 @@ Set quat and scalar dipole moment (dipm) instead.") | |||
| # Ids of the selected particles | |||
| ids = [] | |||
| # Did we get a function as argument? | |||
| if len(args) == 1 and len(kwargs) == 0 and isinstance( | |||
| args[0], types.FunctionType): | |||
| if len(args) == 1 and len(kwargs) == 0 and callable(args[0]): | |||
There was a problem hiding this comment.
remark: classes are callable
There was a problem hiding this comment.
Didn't find an other way to handle Cython oddities.
RudolfWeeber
force-pushed
the
particle_slice.py
branch
2 times, most recently
from
707f210 to
9ffdf6c
Compare
* Return correct elements if particle numbering is non-contigeous * Prevent slicing with negative indices due unclear outcome * Prevent slicing with True/False masks due to unclear outcome * Maintain order created by slicing, e.g. [9:0:-1] * Require that all particles exist when passing an explicit list of ids * Maintain order for explicit list of ids * More rigorous testing * Minor related fixes in other test cases
RudolfWeeber
force-pushed
the
particle_slice.py
branch
from
9ffdf6c to
0a4cadd
Compare
KaiSzuttor
reviewed
Dec 10, 2019
| self.id_selection = np.array(slice_, dtype=int) | ||
| else: | ||
| raise TypeError( | ||
| "ParticleSlice must be initialized with an instance of slice or range, or with a list, tuple, or ndarray of ints, but got {} of type {}".foormat((str(slice_), str(type(slice_))))) |
|
+ raise TypeError(
+ "ParticleSlice must be initialized with an instance of slice or range, or with a list, tuple, or ndarray of ints, but got {} of type {}".foormat((str(slice_), str(type(slice_)))))
typo, is this raise tested?
The spell checker in vim doesn't find the typo. Neither do I (but I'm not good at finding typos).
It's not clear which particular illegal type I should test here. The if is more narrow than the cases that would probably work (anything that is iterable and only contains int-likes). I saw no benefit in allowing more, though.
The more realistic errors such as lists containing non-int-likes are checked. [1, n_part/2]. There was at least one such regression in the testsuite which went undetected before this pr.
|
KaiSzuttor
approved these changes
Dec 11, 2019
|
it seems like kodiak is missing an essential feature, namely updating PRs 😢 |
|
@KaiSzuttor @jngrad So, kodiak isn't up to the job? |
|
yes, see chdsbd/kodiak#104 |
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.
Fixes #3363