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

3d trunk angles #49

Merged
merged 85 commits into from
Mar 13, 2023
Merged

3d trunk angles #49

merged 85 commits into from
Mar 13, 2023

Conversation

arnaudon
Copy link
Contributor

No description provided.

@arnaudon arnaudon force-pushed the trunk_angles_rebase branch 2 times, most recently from 09832c3 to c7b6b59 Compare September 13, 2022 15:23
@arnaudon arnaudon marked this pull request as ready for review September 13, 2022 15:24
neurots/extract_input/input_distributions.py Outdated Show resolved Hide resolved
neurots/extract_input/input_parameters.py Outdated Show resolved Hide resolved
neurots/extract_input/input_parameters.py Outdated Show resolved Hide resolved
neurots/extract_input/input_parameters.py Outdated Show resolved Hide resolved
neurots/generate/grower.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/schemas/distributions.json Outdated Show resolved Hide resolved
@arnaudon arnaudon changed the title Trunk angles rebase 3d trunk angles Sep 14, 2022
@arnaudon arnaudon force-pushed the trunk_angles_rebase branch 2 times, most recently from 30e23cc to 723e9cf Compare September 14, 2022 11:38
@arnaudon arnaudon marked this pull request as draft September 14, 2022 12:41
@arnaudon arnaudon self-assigned this Sep 14, 2022
@arnaudon arnaudon marked this pull request as ready for review September 14, 2022 13:14
@arnaudon
Copy link
Contributor Author

@lidakanari @adrien-berchet , I've clean up the main code, once we agree on it, I'll clean up the schema/tests so we can merge. I'm done with it for now.

neurots/extract_input/from_neurom.py Outdated Show resolved Hide resolved
docs/source/conf.py Show resolved Hide resolved
neurots/extract_input/from_neurom.py Outdated Show resolved Hide resolved
neurots/extract_input/from_neurom.py Outdated Show resolved Hide resolved
neurots/extract_input/from_neurom.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/grower.py Outdated Show resolved Hide resolved
neurots/extract_input/from_neurom.py Outdated Show resolved Hide resolved
neurots/extract_input/input_distributions.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/extract_input/from_neurom.py Show resolved Hide resolved
neurots/extract_input/from_neurom.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/grower.py Outdated Show resolved Hide resolved
@arnaudon
Copy link
Contributor Author

@lidakanari , I wait on your green light to start cleaning up test/schemas

neurots/generate/grower.py Outdated Show resolved Hide resolved
neurots/extract_input/from_neurom.py Outdated Show resolved Hide resolved
neurots/extract_input/input_parameters.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Outdated Show resolved Hide resolved
neurots/generate/orientations.py Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Sep 26, 2022

Codecov Report

Merging #49 (c18688a) into main (01c941f) will increase coverage by 0.11%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main      #49      +/-   ##
==========================================
+ Coverage   97.44%   97.56%   +0.11%     
==========================================
  Files          38       39       +1     
  Lines        1954     2132     +178     
  Branches      288      324      +36     
==========================================
+ Hits         1904     2080     +176     
- Misses         34       35       +1     
- Partials       16       17       +1     
Flag Coverage Δ
pytest 97.56% <100.00%> (+0.11%) ⬆️

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

Impacted Files Coverage Δ
neurots/astrocyte/grower.py 75.86% <ø> (ø)
neurots/astrocyte/tree.py 100.00% <ø> (ø)
neurots/extract_input/input_distributions.py 100.00% <ø> (ø)
neurots/extract_input/input_parameters.py 97.43% <ø> (ø)
neurots/generate/algorithms/tmdgrower.py 99.24% <ø> (-0.02%) ⬇️
neurots/generate/tree.py 98.90% <ø> (-0.02%) ⬇️
neurots/extract_input/from_neurom.py 96.49% <100.00%> (-3.51%) ⬇️
neurots/generate/grower.py 100.00% <100.00%> (ø)
neurots/generate/orientations.py 100.00% <100.00%> (ø)
neurots/morphmath/sample.py 100.00% <100.00%> (ø)
... and 5 more

arnaudon and others added 8 commits February 8, 2023 09:28
Co-authored-by: Adrien Berchet <adrien.berchet@gmail.com>
Co-authored-by: Adrien Berchet <adrien.berchet@gmail.com>
Co-authored-by: Adrien Berchet <adrien.berchet@gmail.com>
Co-authored-by: Adrien Berchet <adrien.berchet@gmail.com>
Co-authored-by: Adrien Berchet <adrien.berchet@gmail.com>
Co-authored-by: Adrien Berchet <adrien.berchet@gmail.com>
@arnaudon
Copy link
Contributor Author

Finally! I can't spot what is not covered, maybe codecov needs some time to be up to date.

@arnaudon
Copy link
Contributor Author

ALL GREEEEN!!!!!!

@adrien-berchet
Copy link
Member

ALL GREEEEN!!!!!!

Yay 🥳

neurots/schemas/distributions.json Show resolved Hide resolved
neurots/schemas/parameters.json Outdated Show resolved Hide resolved
neurots/schemas/parameters.json Show resolved Hide resolved
neurots/schemas/parameters.json Outdated Show resolved Hide resolved
Copy link
Member

@adrien-berchet adrien-berchet left a comment

Choose a reason for hiding this comment

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

LGTM!

@lidakanari
Copy link
Collaborator

Finally double checking and all is good from my side to merge this one. @eleftherioszisis if you want to check for astrocytes please provide feedback for this, otherwise we are ok to merge this one.

@arnaudon
Copy link
Contributor Author

great thanks! I'll then make a minor release of neurots, so we can merge the dependencies

@arnaudon arnaudon merged commit 912320d into main Mar 13, 2023
@arnaudon arnaudon deleted the trunk_angles_rebase branch March 13, 2023 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants