-
Notifications
You must be signed in to change notification settings - Fork 0
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
Refactoring trait pipeline (1/2) #45
Closed
Closed
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit
Hold shift + click to select a range
c896369
Reorganizing the trait_map and modify ellipse, network functions.
f874be3
Update ellipse argument default setting.
c9f4931
Reorganize ellipse and network functions by reducing arguments.
98ce00c
Map convex hull traits
eberrigan d6bd4bb
Change primary to lateral when monocots is True
eberrigan 4d7bc4d
Get tips x and y coordinates uses network map
eberrigan 51d60ab
Change "stem" to "root"
eberrigan a73ebcd
Fix tip y map
eberrigan fc155f8
Change root width back to take lateral_pts
eberrigan ff9530d
Changing the order of positional arguments to match others (primary i…
eberrigan c6e58a3
Fix plotting for using sleap-io API
eberrigan 1bd4ddd
Merge branch 'elizabeth/fix_plotting' into elizabeth/pipeline_cache
eberrigan 25e1047
Make positional arguments consistent
eberrigan eb973bd
Refactor `get_base_xs` to use graph
eberrigan fd30b78
Map `scanline_intersection_counts` and use keyword arguments
eberrigan 4b529ae
Refactor `get_base_ys`, `get_base_length`, and `base_ct_density` to u…
eberrigan 296fcc7
Clean up dependencies. Fix tip_ys.
eberrigan 8f8a39a
Refactor `get_root_lengths_max` for use with graph
eberrigan a25e8b9
Refactor `get_base_tip_dist` to make base and tip pts or all points o…
eberrigan 01ea8bc
Delete `primary_depth`
eberrigan 617f379
Delete traitsgraph
eberrigan 383d454
Delete traitsgraph dependencies
eberrigan 132ac7e
Refactor base-related traits to use graph optionally
eberrigan 3f3967f
Delete traits graph dependency
eberrigan 2f9465f
Use `get_primary_pts` from series class
eberrigan 7cf6817
Delete `get_primary_depth` tests
eberrigan 2f64aaf
Fix trait map for base traits
eberrigan a88dafc
Delete test for traitsgraph.py
eberrigan 2294d14
Standardize trait definition in trait map
eberrigan 7d4c612
Change "graph" to "trait"
eberrigan 393ee9a
Fix docstrings in `get_bases`
eberrigan 519ec93
Use `TraitDef` class
eberrigan 2b54f73
Fix docstrings
eberrigan b3430da
Add argument to class `TraitDef` whether to include in csv or if scalar
eberrigan 3b67c58
Change `attr` to `attrs`
eberrigan d352e86
Add `lengths.py` for length-related traits.
eberrigan 676d055
Add `primary_max_length_pts` to trait definitions
eberrigan 2d437fd
Add `pts_all_array` and `convex_hull` trait definitions
eberrigan 1412c8a
Fix docstring
eberrigan 0979969
Import base-related trait to `lengths.py`
eberrigan c00fa12
Make sure arrays of points are 2-dimensional
eberrigan 2033e08
Streamline point-related functions
eberrigan f37a40c
Vectorize `get_node_ind`
eberrigan a603943
Add trait definitions until `lateral_lengths`
eberrigan 716b670
Delete unnecessary code
eberrigan 752d0a5
Merge branch 'main' into lin/pipeline_cache
72577c8
Merge remote-tracking branch 'origin/Elizabeth/pipeline_cache' into l…
6f04244
Use node_ind for `get_root_angle` function.
e21f57d
Modify base functions by assuming primary_pts as the primary_length_max.
a84b2f8
Modify argument pts as Optional in `get_base_tip_dist` function
e90a8eb
Modify argument pts as Optional in `get_grav_index` function
8cbce05
Draft the trait_definitions using the defined TraitDef class.
f9316ab
Uppercase the `get_root_angle` function arg description.
0143e14
Add test_lengths module for lengths-related functions.
1dbc7c4
Remove lengths-related functions from test_bases.
6e41394
Set pts as Optional argument for `get_grav_index` function.
43a5e90
Change the module name for importing lengths-related functions.
a08a2b6
Remove importing the points functions, only keep `get_all_pts_array`.
95519da
Test ellipse-related functions.
b6f0867
Redo the function `get_node_ind`.
8c249a8
Test function `get_node_ind`.
8b8c523
Angle function reset node_ind to array if only one value.
da05663
Angle function return nan if all Nan node, return value if single array.
bdf1ed4
Test angle functions.
c8aaad1
Add network_width_depth_ratio in trait_definitions.
555d5b0
Reorganize arguments of `get_network_distribution_ratio` function.
dff789c
Add `network_length` trait before calculating `network_solidity`.
2e8099a
Update `primary_root_length` function with calculated lengths.
38ed487
Update `get_network_solidity` function with calculated network_length.
6bd8bef
Test network-related functions.
e676d08
Test points function (`get_all_pts_array`).
81a52f7
Update and test scanline functions using calculated scanline counts.
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 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the input traits always have to match the trait definition. This function is too complicated. We should simplify it to just assume taking in the expected input traits from from the trait graph.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
base_pts
andtip_pts
can be used for our pipeline to quickly calculate the base-tip distance. The optionalpts
is designed for general purpose.