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

Cleanup from readthough #1241

Closed
wants to merge 24 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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
changes I forgot to make
  • Loading branch information
SensibleSalmon committed Aug 12, 2015

Verified

This commit was signed with the committer’s verified signature.
wezm Wesley Moore
commit afd885cfff57f05d4817a5f449662e59720183ea
7 changes: 3 additions & 4 deletions doc/introduction.rst
Original file line number Diff line number Diff line change
@@ -95,7 +95,6 @@ Copyright and license

Portions of khmer are Copyright California Institute of Technology,
where the exact counting code was first developed. All other code developed
through 2014 is copyright Michigan State University. All developed code through
2015 is copyright University of California Davis.
All the code is freely available for
use and re-use under the BSD License.
through 2014 is copyright Michigan State University. Portions are copyright
Michigan State University and Regents of the University of California.
All the code is freely available for use and re-use under the BSD License.
2 changes: 1 addition & 1 deletion doc/user/guide.rst
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ about. Moreover, our assembly strategies themselves are also under
constant evolution as we do more research and find ever-wider
applicability of our approaches.

Note, this is nearly an exact copy of `Titus' blog post, here
Note, this is modified from `Titus' blog post, here
<http://ivory.idyll.org/blog/an-assembly-handbook-for-khmer.html>`__
-- go check the bottom of that for comments.

5 changes: 3 additions & 2 deletions scripts/find-knots.py
Original file line number Diff line number Diff line change
@@ -49,8 +49,9 @@

def get_parser():
epilog = """
Load an k-mer nodegraph/tagset pair created by load-into-nodegraph, and a
set of pmap files created by partition-graph. Go through each pmap file,
Load an k-mer nodegraph/tagset pair created by
:program:`load-into-nodegraph.py`, and a set of pmap files created by
:program:`partition-graph.py`. Go through each pmap file,
select the largest partition in each, and do the same kind of traversal as
in :program:`make-initial-stoptags.py` from each of the waypoints in that
partition; this should identify all of the HCKs in that partition. These