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

Partition sweep #216

Merged
merged 162 commits into from
Jan 13, 2014
Merged

Partition sweep #216

merged 162 commits into from
Jan 13, 2014

Conversation

camillescott
Copy link
Member

Merged branch from cswelcher/khmer to ged-lab/khmer; new pull request reflecting that.

See here for original comments.

camillescott and others added 30 commits July 25, 2013 17:16
Pull request merged into ged-lab/bleeding-edge
…ith python glue, appear to be outputting correct colors
@ged-jenkins
Copy link

Test FAILed.
Refer to this link for build results: http://ci.ged.msu.edu/job/khmer-multi-pullrequest/133/

@camillescott
Copy link
Member Author

test this please

@ged-jenkins
Copy link

Test PASSed.
Refer to this link for build results: http://ci.ged.msu.edu/job/khmer-multi-pullrequest/134/

# consume the partitioned fasta with which to label the graph
ht = khmer.LabelHash(K, HT_SIZE, N_HT)
print >>sys.stderr, 'consuming fastp...'
ht.consume_partitioned_fasta_and_tag_with_labels(input_fastp)
Copy link
Contributor

Choose a reason for hiding this comment

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

Is input_fastp optional? If it is then you need to deal with the fact that it may be empty. If it isn't (as I suspect) then tell the parser above

@ged-jenkins
Copy link

Test PASSed.
Refer to this link for build results: http://ci.ged.msu.edu/job/khmer-multi-pullrequest/135/

* Find all labels associated with the sequence
* For now, check /every/ k-mer with find_all_tags
*/
unsigned int LabelHash::sweep_sequence_for_labels(const std::string& seq,
Copy link
Contributor

Choose a reason for hiding this comment

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

This method has no code testing coverage

@mr-c
Copy link
Contributor

mr-c commented Jan 13, 2014

Please fix the two long lines left and add unit tests for labelhash_consume_sequence_and_tag_with_labels & LabelHash::sweep_sequence_for_labels.

Assuming that nothing else pops up from your fixes I will then merge

@ged-jenkins
Copy link

Test FAILed.
Refer to this link for build results: http://ci.ged.msu.edu/job/khmer-multi-pullrequest/136/

@ged-jenkins
Copy link

Test FAILed.
Refer to this link for build results: http://ci.ged.msu.edu/job/khmer-multi-pullrequest/137/

@camillescott
Copy link
Member Author

please test this Jed

@camillescott
Copy link
Member Author

The function sweep_sequence_for_labels was deprecated in favor of sweep_label_neighborhood; it has been removed.

@ged-jenkins
Copy link

Test PASSed.
Refer to this link for build results: http://ci.ged.msu.edu/job/khmer-multi-pullrequest/139/

mr-c added a commit that referenced this pull request Jan 13, 2014
@mr-c mr-c merged commit f4e0a48 into master Jan 13, 2014
@mr-c mr-c deleted the partition_sweep branch January 13, 2014 22:59
@mr-c mr-c mentioned this pull request Jan 14, 2014
camillescott added a commit that referenced this pull request Jan 14, 2014
Bugs found by coverity from partition_sweep #216
mr-c added a commit that referenced this pull request Apr 1, 2014
camillescott added a commit that referenced this pull request Apr 1, 2014
Bugs found by coverity from partition_sweep #216
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.

6 participants