Skip to content
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

First part of the revised docstrings #138

Merged
merged 33 commits into from
Jul 11, 2022

Conversation

snilsn
Copy link
Collaborator

@snilsn snilsn commented Jun 9, 2022

This PR contains the revision of the docstrings in analysis, center_of_gravity, feature detection, segmentation, testing and tracking.

@snilsn
Copy link
Collaborator Author

snilsn commented Jun 9, 2022

I was not able to figure out what the functions cell_statistics_all(), cell_statistics() and cog_cell() of analysis.py do and how to use them. If anyone has used them I would be grateful for any advice.

@mheikenfeld
Copy link
Member

Hi Nils! I am probably the only one who can help with those functions in analysis.py. It is basically a set of analysis methods for the calculation of specific statistical properties along the cell tracks making use of the segmentation mask. I can have a look at making sure they still work, adding some more detailed documentation to them and putting together a little example notebooks over the next week or so!

@snilsn
Copy link
Collaborator Author

snilsn commented Jun 9, 2022

Thanks Max, appreciate it!

@freemansw1 freemansw1 added this to the Version 1.5 milestone Jun 10, 2022
@freemansw1
Copy link
Member

Thanks Nils! I've requested @JuliaKukulies and I as reviewers for now, and I'll try to review this next week. Sorry for the delayed action, it's been busy for all of us. @mheikenfeld do you want to review as well, or would you rather your thoughts be more informal?

@freemansw1 freemansw1 added enhancement Addition of new features, or improved functionality of existing features documentation Updates and improvements to documentation and examples labels Jun 22, 2022
Copy link
Member

@JuliaKukulies JuliaKukulies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many thanks to you @snilsn! Your great effort on the improved documentation is much appreciated! Before I approve, I have a few comments and suggestions, but most of them are only minor things or direct corrections of typos or misspellings

tobac/analysis.py Outdated Show resolved Hide resolved
tobac/analysis.py Outdated Show resolved Hide resolved
tobac/analysis.py Outdated Show resolved Hide resolved
tobac/analysis.py Outdated Show resolved Hide resolved
tobac/analysis.py Outdated Show resolved Hide resolved
tobac/feature_detection.py Outdated Show resolved Hide resolved
tobac/feature_detection.py Outdated Show resolved Hide resolved
tobac/segmentation.py Outdated Show resolved Hide resolved
tobac/segmentation.py Outdated Show resolved Hide resolved
tobac/testing.py Outdated Show resolved Hide resolved
snilsn and others added 9 commits June 23, 2022 16:07
Co-authored-by: JuliaKukulies <44163060+JuliaKukulies@users.noreply.github.com>
Co-authored-by: JuliaKukulies <44163060+JuliaKukulies@users.noreply.github.com>
Co-authored-by: JuliaKukulies <44163060+JuliaKukulies@users.noreply.github.com>
Co-authored-by: JuliaKukulies <44163060+JuliaKukulies@users.noreply.github.com>
Co-authored-by: JuliaKukulies <44163060+JuliaKukulies@users.noreply.github.com>
Co-authored-by: JuliaKukulies <44163060+JuliaKukulies@users.noreply.github.com>
Co-authored-by: JuliaKukulies <44163060+JuliaKukulies@users.noreply.github.com>
Co-authored-by: JuliaKukulies <44163060+JuliaKukulies@users.noreply.github.com>
Co-authored-by: JuliaKukulies <44163060+JuliaKukulies@users.noreply.github.com>
Copy link
Member

@JuliaKukulies JuliaKukulies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thank you for the quick response on that! I am happy with all the updates so far. Just waiting for our remaining discussion points and then @freemansw1 may want to have a look as well. Really great work :)

tobac/tracking.py Outdated Show resolved Hide resolved
tobac/analysis.py Show resolved Hide resolved
tobac/feature_detection.py Show resolved Hide resolved
tobac/segmentation.py Outdated Show resolved Hide resolved
tobac/feature_detection.py Outdated Show resolved Hide resolved
tobac/feature_detection.py Outdated Show resolved Hide resolved
tobac/feature_detection.py Outdated Show resolved Hide resolved
tobac/analysis.py Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Jun 28, 2022

Codecov Report

❗ No coverage uploaded for pull request base (dev@ae378d2). Click here to learn what that means.
The diff coverage is n/a.

@@          Coverage Diff           @@
##             dev     #138   +/-   ##
======================================
  Coverage       ?   31.59%           
======================================
  Files          ?       11           
  Lines          ?     2048           
  Branches       ?        0           
======================================
  Hits           ?      647           
  Misses         ?     1401           
  Partials       ?        0           
Flag Coverage Δ
unittests 31.59% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ae378d2...0d0f8a2. Read the comment docs.

@snilsn
Copy link
Collaborator Author

snilsn commented Jun 28, 2022

In addition to the changes mentioned in the existing discussions, I made an update to the explanation of the subnetwork_size parameter to reflect the impact of adaptive search.

Copy link
Member

@JuliaKukulies JuliaKukulies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am happy with this now, many thanks @snilsn! The question is only if we want to wait until the missing docstrings in analysis.py are solved or not. I would almost suggest to go ahead without them, since @freemansw1 initiated a general discussion on future of these functions ( #146 ) and because this is only meant to be the first chunk of improved docstrings, not the complete revision. What is your opinion @freemansw1 ?

tobac/segmentation.py Outdated Show resolved Hide resolved
tobac/tracking.py Outdated Show resolved Hide resolved
@mheikenfeld
Copy link
Member

@snilsn: Great work, thanks for the work on making the Docstrings much more concise, even in places where it was not that easy to see what the functions are actually doing. @JuliaKukulies, thanks more the detailed review and additional points. I agree that it might be good to merge this in as it is and then look at analysis.py, plotting.py etc. in more detail as part of the discussion started by @freemansw1 in #146, as a lot of it will probably be moved out of the main tobac codebase so that the really thorough documentation of it might be unnecessary work...

Copy link
Member

@freemansw1 freemansw1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, really excellent job. Just some minor changes here.

tobac/analysis.py Outdated Show resolved Hide resolved
tobac/analysis.py Outdated Show resolved Hide resolved
tobac/analysis.py Outdated Show resolved Hide resolved
tobac/analysis.py Show resolved Hide resolved
tobac/analysis.py Show resolved Hide resolved
tobac/feature_detection.py Outdated Show resolved Hide resolved
tobac/segmentation.py Outdated Show resolved Hide resolved
tobac/segmentation.py Show resolved Hide resolved
tobac/tracking.py Outdated Show resolved Hide resolved
tobac/tracking.py Outdated Show resolved Hide resolved
@snilsn
Copy link
Collaborator Author

snilsn commented Jun 29, 2022

Thanks for your feedback, @freemansw1. This new update should address all the remarks you made, and also the remaining open conversations

Copy link
Member

@freemansw1 freemansw1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy with this now!

@freemansw1
Copy link
Member

I am happy to merge this now, if you are @snilsn . Are you (and @JuliaKukulies ) happy for us to merge this as a squash merge, or should we merge as a normal merge commit?

@freemansw1
Copy link
Member

Actually I realized we should wait to merge this until we are staging for v1.4.0, and I am disinclined now from doing a squash merge, so I will plan on merging with a normal commit.

@snilsn
Copy link
Collaborator Author

snilsn commented Jun 29, 2022

I would be happy with both options

@JuliaKukulies
Copy link
Member

I agree that it is good to wait for staging for v1.4.0 and not sure about the squash commit. I think @snilsn has written quite clear commit messages and kept the commits organized so that it is easy to follow what has been changed. It is just quite many commits, because my direct suggestions for typo fixes all come as single commits. Maybe I could find a way to only squash those? That would reduce the number of commits by more than half

@freemansw1 freemansw1 changed the base branch from dev to RC_v1.4.0 July 9, 2022 16:42
@freemansw1
Copy link
Member

As discussed in our meeting yesterday, I've moved this to target v1.4.0, so I'm now happy for us to merge this as long as you are happy @snilsn .

@snilsn
Copy link
Collaborator Author

snilsn commented Jul 10, 2022

Yes, all good. Please go ahead

@freemansw1 freemansw1 merged commit 3900b63 into tobac-project:RC_v1.4.0 Jul 11, 2022
@snilsn snilsn deleted the docstrings branch July 11, 2022 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Updates and improvements to documentation and examples enhancement Addition of new features, or improved functionality of existing features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants