-
Notifications
You must be signed in to change notification settings - Fork 61
minor english corrections #79
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -260,7 +260,7 @@ def correct_close_events(self, nb_days_max=20): | |
| # FIXME : we want to change | ||
| # segment A splits from segment B, then x days after segment B merges with A | ||
| # to | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe create a project note or an issue for improvement, about that |
||
| # segment A splits from segment B the x days after segement A merges with B (B will be longer) | ||
| # segment A splits from segment B then x days after segement A merges with B (B will be longer) | ||
| # comments are in the wrong way but the example works as wanted | ||
|
|
||
| _time = self.time | ||
|
|
@@ -321,7 +321,6 @@ def sort(self, order=("track", "segment", "time")): | |
|
|
||
| :param tuple order: order or sorting. Given to :func:`numpy.argsort` | ||
| """ | ||
|
|
||
| index_order = self.obs.argsort(order=order) | ||
| for field in self.elements: | ||
| self[field][:] = self[field][index_order] | ||
|
|
@@ -497,8 +496,10 @@ def relatives(self, obs, order=2): | |
| """ | ||
| Extract the segments at a certain order from multiple observations. | ||
|
|
||
| :param iterable,int obs: indexes of observation for relatives computation. Can be one observation (int) or collection of observations (iterable(int)) | ||
| :param int order: order of relatives wanted. 0 means only observations in obs, 1 means direct relatives (1 interaction event), ... | ||
| :param iterable,int obs: indexes of observation for relatives computation. | ||
| Can be one observation (int) or collection of observations (iterable(int)) | ||
| :param int order: order of relatives wanted. | ||
| 0 means only observations in obs, 1 means direct relatives (1 interaction event), ... | ||
|
|
||
| :return: all segments' relatives | ||
| :rtype: EddiesObservations | ||
|
|
@@ -1206,8 +1207,8 @@ def fully_connected(self): | |
|
|
||
| def remove_trash(self): | ||
| """ | ||
| Remove the lonely eddies (only 1 obs in segment, associated segment number is 0)""" | ||
|
|
||
| Remove the lonely eddies (only 1 obs in segment, associated segment number is 0) | ||
| """ | ||
| return self.extract_with_mask(self.track != 0) | ||
|
|
||
| def plot(self, ax, ref=None, color_cycle=None, **kwargs): | ||
|
|
||
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
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.
Uh oh!
There was an error while loading. Please reload this page.