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

Various tools for assembling directly from the graph, including using labels to track paths. #1412

Merged
merged 97 commits into from
Oct 31, 2016
Merged
Changes from 1 commit
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
5e41d57
Merge branch 'update/remove_labelptr' into feature/pathlink
ctb Jun 9, 2016
8d77afe
basic compilation works
ctb Jun 9, 2016
b1e99ed
track labels in collapsed linear paths
ctb Jun 9, 2016
a432f0e
cleanup & commenting
ctb Jun 9, 2016
b3a7c3f
add assemble_labeled_path
ctb Jun 9, 2016
ddedd03
compile, basic fns & API
ctb Jun 9, 2016
8c6d069
changed fn signature of assemble_labeled_right
ctb Jun 9, 2016
d58a139
seems to be ...working?
ctb Jun 9, 2016
a707942
made left + right assembly work
ctb Jun 9, 2016
3740422
a first attempt at streaming assembly
ctb Jun 9, 2016
dc517f8
Merge branch 'update/remove_labelptr' into feature/pathlink
ctb Jun 10, 2016
fcf61c0
basic stuff is working
ctb Jun 10, 2016
5e08729
fix print function py2 issue
ctb Jun 10, 2016
a3e6cfa
track visited & avoid infinite loops
ctb Jun 12, 2016
de261f6
add extract-unassembled-reads*py
ctb Jun 15, 2016
04168a6
Merge branch 'master' of github.com:dib-lab/khmer into feature/pathlink
ctb Jun 25, 2016
22393ea
Merge branch 'feature/assemble' into feature/pathlink
ctb Jun 26, 2016
7125a33
Merge branch 'update/remove_labelptr' into feature/pathlink
ctb Jun 26, 2016
6e9650e
Merge branch 'master' of github.com:dib-lab/khmer into feature/pathlink
ctb Jun 27, 2016
c63f31e
fix typo
ctb Jun 27, 2016
250a997
Merge branch 'master' of github.com:dib-lab/khmer into feature/pathlink
ctb Jun 27, 2016
e994c91
fixed bug with 'temporary' use of std:string
ctb Jul 5, 2016
8b3a22b
Merge branch 'fix/readpairiter_error' into feature/pathlink
ctb Jul 18, 2016
1a61e5c
Merge branch 'master' of https://github.com/dib-lab/khmer into featur…
ctb Jul 18, 2016
aa7e7b6
update extract-unassembled-reads* sandbox scripts for python3
ctb Jul 18, 2016
fd9d82c
fix @ljcohen short sequence issue?
ctb Jul 18, 2016
1ea39f1
Make build_kmer const method
camillescott Jul 25, 2016
da2408a
First pass assembler class
camillescott Jul 25, 2016
55350d1
Add an assemble_left function to match assemble_right
camillescott Jul 26, 2016
e33cef4
TEMPORARILY add github target for screed bugfix to pass tests
camillescott Jul 26, 2016
df3a859
TEMPORARILY add github target to all target for testing
camillescott Jul 26, 2016
d135d8d
Add TEMP screed install to install deps, roll back other stuff
camillescott Jul 26, 2016
ef41583
Fix pep8 for jenkins
camillescott Jul 26, 2016
80df67f
Add node filtering functions
camillescott Jul 26, 2016
df30190
Add more debugging output
camillescott Jul 27, 2016
bbc80fd
Turn on debugging
camillescott Jul 27, 2016
40e4766
Merge branch 'feature/review/pathlink' of github.com:ged-lab/khmer in…
camillescott Jul 27, 2016
f663b6c
Update tag and label getters to take a reference to Tag and Label sets
camillescott Aug 5, 2016
37b8fad
Create a global collection of symbol alphabets
camillescott Aug 5, 2016
357f8be
Add symbols.hh and cc to setup.py
camillescott Aug 5, 2016
5ee5eb9
Add tracking info assembly script; add specialized assembler traverser
camillescott Aug 5, 2016
eb8857d
Expose reverse complement function to Python land
camillescott Aug 9, 2016
0d288b3
Add import for reverse_complement
camillescott Aug 10, 2016
1bb912b
Add string representation for Kmer
camillescott Aug 10, 2016
5220f41
Modify AssemblerTraverser to only emit found bases; update Assembler …
camillescott Aug 10, 2016
7fb2006
Check for orientation of seed kmer
camillescott Aug 10, 2016
80cd04c
Remove some debugging output
camillescott Aug 10, 2016
7b2c5ff
Add a template parameter for the direction of the AssemblerTraverser.
camillescott Aug 11, 2016
a298b48
Fix direction parameters
camillescott Aug 11, 2016
cf55bd7
Fix syntax error from bad patch
camillescott Aug 11, 2016
e42c89c
Replace function redirection with template specialization
camillescott Aug 11, 2016
37596f9
First pass at LabeledLinearAssembler
camillescott Aug 11, 2016
5ee1b9a
Refactor labeled assembly into LabeledLinearAssembler, right assembly…
camillescott Aug 12, 2016
3ddeeec
Fill out direction templating for Labeled assembly, all tests passing
camillescott Aug 13, 2016
6f07427
explicitly add assembler functions to khmer namespace instead of a us…
camillescott Aug 15, 2016
8217e35
Reorganize AssemblerTraverser into traversal
camillescott Aug 15, 2016
d59cd3e
Try declaring template specs
camillescott Aug 16, 2016
93fcabc
Remove const qualifier on SeenSet * visited to allow call to insert
camillescott Aug 16, 2016
341f3d2
Add new headers to liboxli Makefile
camillescott Aug 16, 2016
5377440
Make Pep8 compliant, update _equals_rc to use new khmer rc method
camillescott Aug 16, 2016
1a81fcd
Remove -Wmaybe-uninitialized compiler warning at traversal.cc 225
camillescott Aug 16, 2016
3ab109c
Update ChangeLog
camillescott Sep 26, 2016
1c09279
Update from master into temp branch
camillescott Sep 26, 2016
ebe35a9
Merge master
camillescott Sep 26, 2016
44af1ea
Cleanup some commented code and add some documentation to LabeledLine…
camillescott Sep 26, 2016
a98a10b
Do autoformat
camillescott Sep 26, 2016
f256d49
Refactor Traverser into two new classes, NodeGatherer and NodeCursor,…
camillescott Sep 27, 2016
011cdd6
LabeledLinearAssembler renamed to NaiveLabeledAssembler; remove redud…
camillescott Sep 30, 2016
9834c59
Merge branch 'feature/assemble' into feature/review/pathlink
ctb Oct 1, 2016
d2788fd
Merge branch 'master' of github.com:dib-lab/khmer into feature/review…
ctb Oct 1, 2016
281bae1
Merge branch 'master' of github.com:dib-lab/khmer into feature/review…
ctb Oct 1, 2016
0e29e73
Change alphabets to string and iterate with auto for loop; rename sym…
camillescott Oct 3, 2016
dac2e26
Add an additional revcomp check and mutate to be sure that all contig…
camillescott Oct 3, 2016
3344316
Remove unused set_cursor; allow an offset for join_contigs
camillescott Oct 3, 2016
8a1ad98
Rename labeled assembler, enable proper branching along with simple t…
camillescott Oct 3, 2016
b7be942
Merge branch 'feature/assembly/tipkiller' into feature/review/pathlink
camillescott Oct 3, 2016
96787bf
Revert setup.py compile arg change
camillescott Oct 3, 2016
7b7ff69
Add updated doxygen comments and move a couple function to their base…
camillescott Oct 4, 2016
151e366
Remove sneaky alphabet from Makefile
camillescott Oct 4, 2016
f36129d
Move assembly tests to their own file and add some utilities (with te…
camillescott Oct 4, 2016
49b3d3a
Rename some tests, cluster with Classes, add clear comments with grap…
camillescott Oct 4, 2016
80a6959
remove interrupted test, as it is not necessary and covered by test_r…
camillescott Oct 4, 2016
3f41db3
Rewrite assembly tests with fixtures, parameterize for sequence lengt…
camillescott Oct 5, 2016
7a32a8a
Allow passing stop_bf to labeled assembler from Pythonland
camillescott Oct 6, 2016
8ed3587
Add graph structure fixtures for forks and bubbles, and convert tests…
camillescott Oct 6, 2016
2a7af83
Remove debug flags
camillescott Oct 6, 2016
0bc8e19
Merge master
camillescott Oct 6, 2016
1fb22be
Add encoding to test_assembly.py
camillescott Oct 6, 2016
8f37482
pep8 compliance
camillescott Oct 6, 2016
2fdf515
Fix some pep8 and a dumb error
camillescott Oct 6, 2016
ab47816
Convert SimpleLabeledAssembler to iterative impl
camillescott Oct 7, 2016
048a6d2
Add a test for tandem repeats
camillescott Oct 7, 2016
32929f6
Change signature of AssemblerTraverser::next_symbol to virtual to all…
camillescott Oct 7, 2016
aaa970f
Merge branch 'master' into feature/review/pathlink
ctb Oct 30, 2016
c5b8d52
Merge branch 'master' into feature/pathlink
betatim Oct 31, 2016
62dd982
Formatting only changes via `make format`
betatim Oct 31, 2016
361511a
fix pep8
ctb Oct 31, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:dib-lab/khmer into feature/pathlink
  • Loading branch information
ctb committed Jun 27, 2016
commit 6e9650e96f1b90e5f65c8e70dfe20cbab894a89e
37 changes: 37 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
2016-06-26 Titus Brown <titus@idyll.org>

* khmer/_khmer.cc, lib/{hashtable.cc, hashtable.hh},
tests/test-data/simple-genome.fa, tests/test_nodegraph.py: added functions
'find_high_degree_nodes' and 'traverse_linear_path' to hashtables/graphs.
* lib/kmer_hash.cc: minor change to use object member _seq instead of
constructor argument seq in KmerIterator.
* lib/kmer_hash.hh: added const to Kmer::get_string_rep(...) signature.
* sandbox/extract-compact-dbg.py: new sandbox script to
extract compact De Bruijn graphs (with linear paths contracted).
* tests/test_sandbox_scripts.py: added tests for the extract-compact-dbg.py
script.

2016-06-26 Titus Brown <titus@idyll.org>

* lib/khmer.hh,lib/{labelhash.cc,labelhash.hh}: removed label pointer-based
Expand All @@ -6,6 +19,30 @@
* tests/test_labelhash.py: renamed to match new API; no changes in test
logic.

2016-06-17 Daniel Standage <daniel.standage@gmail.com>

* scripts/filter-abund-single.py: add -o/--outfile option.
* tests/test_script_output.py: move `_calc_md5` function for calculating
file MD5 hashes to test utils module (tests/khmer_tst_utils.py).
* tests/{test_filter_abund.py,test_scripts.py): move filter_abund tests to
dedicated test script, add minimal test for new -o option.
* tests/test-data/paired-mixed-witherror.fa.pe: add data file in support of
new test.
* .gitignore: add .cache/ directory, which appears to be an artifact of the
py.test framework.

2016-06-17 Daniel Standage <daniel.standage@gmail.com>

* scripts/filter-abund-single.py: add -o/--outfile option.
* tests/test_script_output.py: move `_calc_md5` function for calculating file
MD5 hashes to test utils module (tests/khmer_tst_utils.py).
* tests/{test_filter_abund.py,test_scripts.py): move filter_abund tests to
dedicated test script, add minimal test for new -o option.
* tests/test-data/paired-mixed-witherror.fa.pe: add data file in support of
new test.
* .gitignore: add .cache/ directory, which appears to be an artifact of the
py.test framework.

2016-05-25 Titus Brown <titus@idyll.org>

* scripts/trim-low-abund.py: switched to watermark-based reporting to
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.