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

[MRG] Add deduction of ksize from query #119

Closed
wants to merge 3 commits into from

Conversation

betatim
Copy link
Contributor

@betatim betatim commented Jan 19, 2017

Fixes #105

When the query only contains one k-size then use that unless
user specified a particular k. Same when there is only one molecule type.

  • search
  • compare
  • watch
  • gather

  • Is it mergeable?
  • make test Did it pass the tests?
  • make coverage Is the new code covered?
  • Did it change the command-line interface? Only additions are allowed
    without a major version increment. Changing file formats also requires a
    major version number increment.
  • Was a spellchecker run on the source code and documentation after
    changes were made?

@betatim betatim changed the title Add deduction of ksize from query [WIP] Add deduction of ksize from query Jan 19, 2017
@codecov-io
Copy link

codecov-io commented Jan 19, 2017

Codecov Report

Merging #119 into master will decrease coverage by 0.16%.
The diff coverage is 76.47%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #119      +/-   ##
==========================================
- Coverage    85.6%   85.44%   -0.17%     
==========================================
  Files          13       13              
  Lines        1897     1903       +6     
  Branches       52       52              
==========================================
+ Hits         1624     1626       +2     
- Misses        262      266       +4     
  Partials       11       11
Impacted Files Coverage Δ
sourmash_lib/sourmash_args.py 93.42% <100%> (+0.17%) ⬆️
sourmash_lib/commands.py 89.4% <71.42%> (-0.56%) ⬇️

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 6f6effd...224a632. Read the comment docs.

@ctb
Copy link
Contributor

ctb commented Apr 9, 2017

Note addition of load_one_signature in #155.

@betatim betatim changed the title [WIP] Add deduction of ksize from query [MRg] Add deduction of ksize from query Apr 12, 2017
@betatim
Copy link
Contributor Author

betatim commented Apr 12, 2017

I'll think again about load_one_signature, though it seems right now we do Ok with the existing loaders. They all seem to error when there is ambiguity.

@betatim betatim changed the title [MRg] Add deduction of ksize from query [MRG] Add deduction of ksize from query Apr 12, 2017
"""Walk nodes in `tree` to find out ksize"""
for node in tree.nodes.values():
if isinstance(node, sourmash_lib.sbtmh.SigLeaf):
return node.data.estimator.ksize
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Need to investigate why codecov thinks this line isn't covered

@ctb
Copy link
Contributor

ctb commented Apr 13, 2017 via email

@betatim betatim force-pushed the default-args branch 2 times, most recently from 18a4d61 to 600cb57 Compare April 26, 2017 11:27
@betatim
Copy link
Contributor Author

betatim commented Apr 26, 2017

Refreshed this.

Still not quite sure how to modify this to use load_one_signature :-/

@ctb
Copy link
Contributor

ctb commented May 16, 2017

Refresh this and I'll merge.

Note: may fix #189 too.

@ctb
Copy link
Contributor

ctb commented May 16, 2017

Also note: if you make these branches on the dib-lab repo I can refresh...

When the query only contains on k-size then use that unless
user specified a particular k.
@betatim
Copy link
Contributor Author

betatim commented May 16, 2017

Sorry about the foreign branch, keep forgetting.

@ctb ctb mentioned this pull request May 16, 2017
5 tasks
@ctb
Copy link
Contributor

ctb commented May 16, 2017

Updated in #224 - might as well just merge that one, I guess?

@luizirber
Copy link
Member

Fixed by #224

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