Commit Graph

23 Commits (d8fedd59be86cc83cb368df76d3e18b654a52f8a)

Author SHA1 Message Date
hanna 331d6db783 Reduce file handle usage.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2503 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-05 18:03:01 +00:00
hanna b6ecc9e151 Support for ad-hoc reference sequences. Also reenabled BWA/Java integration test, which was commented out
and the data backing it up deleted without my knowledge.  Unfortunately, since the data was deleted, I had
to regenerate the data and a new md5.  Hopefully the aligner output is still correct.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2493 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-02 20:19:14 +00:00
hanna af9fe78f84 Add a Unix-standard version number to the file.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2125 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-23 20:07:17 +00:00
hanna c9c4999354 BWA: odds and ends. Get rid of some spurious debug code that was accidentally
checked in.  Add a better way to write out unmapped reads (thanks Kiran!)  Add 
a pre-built version of the shared library to the repository for early adoption.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2111 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-22 15:26:07 +00:00
hanna 4fbb6d05d0 Refactoring. Push the revisions to the common aligner interface down into
the aligner base classes.  Hack the managed implementation to support the
new interface.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2103 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-20 17:08:09 +00:00
hanna 38a030f2ba Finishing off data transfer conduits for single alignment generator.
Misc bug fixes elsewhere.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2101 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-20 15:21:59 +00:00
hanna a95302fe98 Single alignment generator, another checkpoint. Does generate single alignments, but some of the data still
needs to plumbed through and it may leak memory.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2095 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-19 21:20:03 +00:00
hanna a972b2769f Checkpoint. Add first phase of single alignment interface.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2094 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-19 19:03:43 +00:00
hanna 768f865035 Bulletproofing code. If errors are encountering during the run, turn them
into JDK exceptions whenever possible instead of random core dumps.  Don't
allow negative values for most of the 'bwa aln' input parameters.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2049 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-14 22:57:16 +00:00
hanna 15c14add4d Repackage the aligner for better partitioning. The C aligner, for example, is now
partitioned from the Java aligner, and both are partitioned from the more general-
purpose BWT reader.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2045 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-13 22:55:27 +00:00
hanna f5818c0cda Fix max edit distance to ensure interface similarity between our aligner and
'bwa aln'.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2043 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-13 22:18:56 +00:00
hanna 0c2a957ae0 Better configuration support. Now supports everything that people have expressed interest in except edit distance.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2021 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-11 20:54:49 +00:00
hanna 637f02f392 BWA/C changes have arrived in svn repository. Remove temporary storage from Sting repository.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2019 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-11 16:48:21 +00:00
hanna f73dd09399 More preparation for bwa patch: create a crude, minimal build system to build
against a static library that the bwa compile (now) generates.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1980 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-06 18:41:01 +00:00
hanna 15e80aec3b Temporarily adding changed bwa files to Sting repository until I can pull together the official bwa patch.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1975 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-04 21:46:05 +00:00
hanna 43c3ee61d5 Fix minor mapping quality bug.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1973 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-04 14:33:23 +00:00
hanna c63af32fc7 The BWA/C bindings were triggering the local aligner to repeatedly reload the
ref genome.  Make sure the reference genome is cached.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1961 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-03 00:01:55 +00:00
hanna 1896f334d9 Fixed collection of bugs in reads aligning to multiple locations.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1955 348d0f76-0448-11de-a6fe-93d51630548a
2009-11-02 04:02:09 +00:00
hanna 2d15891719 Created walkers for alignment, validation.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1945 348d0f76-0448-11de-a6fe-93d51630548a
2009-10-30 15:04:07 +00:00
hanna 1f0d852a48 Fix bug where alignments with indels would be busted because bwa reverses
the read bases to undo a previous read base reverse that doesn't occur in the
libbwa codepath.
Also fixed some memory management issues.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1938 348d0f76-0448-11de-a6fe-93d51630548a
2009-10-29 21:33:13 +00:00
hanna f04b80d7db Fixed epic memory leak.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1934 348d0f76-0448-11de-a6fe-93d51630548a
2009-10-29 16:32:43 +00:00
hanna c9a3707cfd Initial version of BWA/C bindings. Still lots of squirrels roaming the code.
- Some cigar strings aren't right.
- Memory leaks.
- BWA codebase changes aren't committed to BWA tree.
- Aligner interface butchered to support BWA/C-style alignments.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1928 348d0f76-0448-11de-a6fe-93d51630548a
2009-10-28 21:37:49 +00:00
hanna 2ee2623926 Move non-java code out of playground.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@154 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-23 19:31:38 +00:00