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

Move visualisation and assign query into their own programs #112

Merged
merged 33 commits into from
Nov 17, 2020

Conversation

johnlees
Copy link
Member

@johnlees johnlees commented Oct 14, 2020

Mostly moving chunks of main() around, and some changes to the command line options. Once this is finished and merged rewriting the docs (#74) will be a priority

  • Change --fit-model to take options gmm, dbscan, refine, threshold or use
  • Remove --full-db from assign_query
  • Get rid of easy run
  • Ensure return_dict = True in printExternalClusters()
  • Check for zero sequences to remove in reference_pick.py L84-85
  • Check that query with a single sequence works (may get zero length self dist matrix)
  • Check assign with an older model
  • Check visualise with an older model
  • Check assign with a lineage model (all ranks output)
  • Check visualise with a lineage model
  • Visualise needs to work with assign query output. It will require update db, and should still output query/ref in the table
  • Visualise with assigned model + lineage mode (all ranks output and Visualisation with assign query + lineage fit #120 addressed)

Closes #77, closes #107

NB: merge #108 and #110 first

@johnlees
Copy link
Member Author

97d215f closes #111

@johnlees johnlees linked an issue Oct 14, 2020 that may be closed by this pull request
@johnlees
Copy link
Member Author

TODO: change --fit-model to take options gmm, dbscan, refine, threshold or use

@johnlees
Copy link
Member Author

Also, remove the --full-db option from assign mode

@johnlees johnlees marked this pull request as ready for review November 11, 2020 13:04
@johnlees johnlees linked an issue Nov 16, 2020 that may be closed by this pull request
@johnlees johnlees linked an issue Nov 16, 2020 that may be closed by this pull request
Best way to do this is with --update-db, but this works if needed (add --query-db)
No update db in lineage query test
@johnlees johnlees merged commit 2032f79 into master Nov 17, 2020
@johnlees johnlees deleted the separate_functions branch November 17, 2020 15:16
Copy link
Collaborator

@nickjcroucher nickjcroucher left a comment

Choose a reason for hiding this comment

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

All looks great - made a couple of suggestions on how the command line instructions might be simplified in the context of these changes, would be interested to know what you think.

PopPUNK/__init__.py Show resolved Hide resolved
test/run_test.py Show resolved Hide resolved
test/run_test.py Show resolved Hide resolved
PopPUNK/visualise.py Show resolved Hide resolved
PopPUNK/visualise.py Show resolved Hide resolved
PopPUNK/__main__.py Show resolved Hide resolved
@johnlees
Copy link
Member Author

Suggestions addressed in #125

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants