-
Notifications
You must be signed in to change notification settings - Fork 2
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
Update trajectory.py #3
Open
directysj
wants to merge
20
commits into
jcopperm:main
Choose a base branch
from
ZuckermanLab:directysj-patch-1
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
Jalim, I don't think merging these branches makes sense. It looks like you have altered the main trajectory class in trajectory.py for your cellpose based analysis. We should bring this up in code review and ask John for some ideas here. Without subclassing, I don't know how to merge these, but without merging I don't see how to keep both branches updated diverging changes. |
We can have two different classes in the trajectory.py file and one can
call which one is needed.
Thanks & best regards
*Jalim Singh*
* Postdoctoral Fellow,*
* Oregon Health & Science University,*
* Portland OR, United States*
…On Mon, Mar 6, 2023 at 9:09 AM jcopperm ***@***.***> wrote:
Jalim, I don't think merging these branches makes sense. It looks like you
have altered the main trajectory class in trajectory.py for your cellpose
based analysis. We should bring this up in code review and ask John for
some ideas here. Without subclassing, I don't know how to merge these, but
without merging I don't see how to keep both branches updated diverging
changes.
—
Reply to this email directly, view it on GitHub
<#3 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALCE3EUB2DSIVKLPXTN7GRDW2YK53ANCNFSM6AAAAAAUIE3WRU>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
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.
I have added a subclass to the Trajectory class, please have a look .