Commit Graph

200 Commits (2b59110dcae8beedc0c74a1a8e11d4dbff8cce6f)

Author SHA1 Message Date
kiran 607731da91 Fixed a harmless (but annoying) bug wherein the read name for the SAMRecords increases by two on every iteration rather than one.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@189 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-25 15:20:29 +00:00
jmaguire 44acc358b7 Add a "notes" member to the AlleleFreqencyEstimate, e.g. for hapmap metadata.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@188 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-25 15:18:10 +00:00
depristo d11bb0fc64 Added xReadLines class to utils. It is a iterator<string> and iterable<string> so you can easily read all lines from a file. It's been used to simplify the code to process intervals, and will be used to add merging data support to the system...
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@187 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-25 15:17:38 +00:00
asivache 4c29dca70d git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@186 348d0f76-0448-11de-a6fe-93d51630548a 2009-03-25 09:23:42 +00:00
asivache 71d3e8e99b fixed another bug in gapped alignment computation
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@185 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-25 08:33:57 +00:00
asivache 40f45c2333 git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@184 348d0f76-0448-11de-a6fe-93d51630548a 2009-03-25 05:48:10 +00:00
depristo 8bdf49a01f added slightly more useful output to Depth of Coverage walker. (now prints number of loci). Traversal engine now actually prints the reduce result (key) and no longer prints millions of locus interval updates
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@183 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-25 03:12:54 +00:00
depristo ff98e28abf High-performance interval list implement -- uses StringBuilder to avoid n^2 calculation. Can handle millions of locations quickly now
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@182 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-25 02:17:48 +00:00
andrewk 30babbf5b9 Restructured AlleleFrequencyMetricsWalker to correctly report Hapmap concordance numbers for genotyping and added reporting for Hapmap reference/variant calling. Also, tiny bugfix in interval code.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@181 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-25 01:12:05 +00:00
hanna 9e2a373184 Prototype, buggy implementation of walker command-line arguments. Doesn't
(yet) deal elegantly with even simple cases.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@180 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-25 00:12:00 +00:00
depristo 919a86e876 Cleaned up code for by interval traversals for Jared. Initialization code refactored and made clear. by loci and by loci by interval use the same underlying code now. Everyone uses the same initialization code to set things up. It's a party in the TraversalEngine and everyone's invited...
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@179 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 22:32:45 +00:00
kiran 28c1330b4b Fixed a bug wherein the loop variable for the second end of the pair was actually looping over the entire raw read (first and second ends combined).
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@178 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 21:59:25 +00:00
aaron c047b53d6b added some cleanup of code, and new junit targets to the build file
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@177 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 21:16:12 +00:00
aaron c2b2ed8e1d added our first junit test, for the argument parser
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@176 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 21:14:30 +00:00
depristo 6df19ab793 Support for byInterval traversals for Jared. Do not use them.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@175 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 20:55:34 +00:00
depristo 9f500215da Support for reseting the system; Cleanup later
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@174 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 20:52:11 +00:00
kiran 499c422de6 A version of the four-base caller that computes the probability distribution over base call space by initializing off the Bustard calls rather than the ICs.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@173 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 20:11:39 +00:00
asivache 4222016bf5 stop printing sw matrix and other debug infoant
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@171 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 18:15:52 +00:00
asivache 8ea8a74fbf fixed bug in calculation of alignment start offset for negative offsets; toString() added
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@170 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 18:05:28 +00:00
asivache 9aa1ccd9b7 fixed some bugs in calling the optimal path; parameters adjusted (?)
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@169 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 17:27:51 +00:00
kiran 88d94d407a Fixed a bug in the parsing of the second end of the pair.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@168 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 14:34:37 +00:00
asivache 786a7845dd git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@167 348d0f76-0448-11de-a6fe-93d51630548a 2009-03-24 14:06:44 +00:00
asivache 3d1e0bf079 git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@166 348d0f76-0448-11de-a6fe-93d51630548a 2009-03-24 14:06:24 +00:00
aaron a3b8830855 need more access, found out in junit testing
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@165 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 13:22:09 +00:00
asivache 908065125f computes Smith-Waterman pairwise alignment
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@164 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 05:36:37 +00:00
andrewk 9dee9ab51c Added Hapmap data track (using rodGFF class for GFF file format) to toolkit as a command line option, Hapmap metrics to AlleleFrequencyMetricsWalker, and a python Geli2GFF file converter.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@163 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 03:58:03 +00:00
hanna f7363cf935 Support for loading from either a jar or a class directory. Fixes troubles with IntelliJ debugging.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@162 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-24 03:56:49 +00:00
hanna 63cd1fe201 Push core / playground lower into the tree.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@160 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-23 23:19:54 +00:00
hanna 5031875507 Move to new directory organization.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@35 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-11 20:58:01 +00:00
hanna 6a0a45950e First swipe at autogeneration of the classpath.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@33 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-11 19:44:02 +00:00
andrewk 3c605e95cb First inklings of a unified allele caller!
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@32 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-11 17:54:24 +00:00
hanna 150610d63d Move to ivy for dependency management.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@31 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-11 17:14:04 +00:00
depristo 393400deea Documented TraveralEngine
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@30 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-10 22:09:12 +00:00
jmaguire 716af47dd5 Added NullWalker module (do nothing).
Added SingleSampleGenotyper module (old-school single sample genotyping).

Added Utils.SortPermutation (return the permutaton that would sort the input array).
Added Utils.PermuteArray (apply a permutation to an array).



git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@29 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-10 21:26:07 +00:00
hanna ea0a826f8f Clean up 3rd party dependencies.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@27 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-10 19:34:00 +00:00
depristo e4bde58353 Fix for inaccurate and misleading timing information, now only prints estimated time to completion when the location flag isn't set
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@25 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-10 14:59:42 +00:00
jmaguire 17c94a8c5c make build.xml work from within the java directory.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@24 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-06 22:58:12 +00:00
andrewk e938dbda47 Check for the existence of the module name and return error rather than throwing an exception if not found.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@23 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-04 00:15:35 +00:00
depristo a81a1bdbb4 Minor bug fixed to progress meter
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@22 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-02 22:19:39 +00:00
depristo 851e1df072 reconciled TraversalEngine
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@21 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-02 21:51:25 +00:00
depristo 46c3f1a0ac Support for progress tracking during parsing of SAM files.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@20 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-02 21:49:08 +00:00
depristo 49a84c965e Added basic GenomeLoc class
Support for operating on any location in genome (albeit slowly)
Improvements to dbSNP support

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@19 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-02 18:18:48 +00:00
depristo 63f8d82e36 Fix for ROD in TraversalEngine
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@18 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-02 02:46:34 +00:00
depristo b19e4b502b Continuing to expand support for ROD. These edits add a program, PrepareROD, that sorts and prepares RODs for consumption by the analysis TK.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@17 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-01 23:32:23 +00:00
depristo fd447d7c1d Renamed Empty to Count methods in analysisTK
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@16 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-01 23:31:33 +00:00
depristo a5c76f7666 Renamed Empty to Count methods in analysisTK
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@15 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-01 23:31:23 +00:00
depristo 0ee2375292 Working on reference ordered data; added build.xml for ant!
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@14 348d0f76-0448-11de-a6fe-93d51630548a
2009-03-01 18:27:32 +00:00
depristo f64f3e2d90 Phase II support for generic reference order data set parsing.
Can read GFF and dbSNP files correctly.  
Traversal engine now supports keeping moving window of reference ordered data along with the locus iterator.
Tested by walking through a sam file keeping track of the dbSNP positions encountered -- they definitely look right...


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@13 348d0f76-0448-11de-a6fe-93d51630548a
2009-02-28 20:47:48 +00:00
depristo dee840efa5 Moved out of java/src
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@12 348d0f76-0448-11de-a6fe-93d51630548a
2009-02-28 17:52:34 +00:00
depristo 17aabb38f9 Basic reorganization of tree
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@8 348d0f76-0448-11de-a6fe-93d51630548a
2009-02-28 15:28:56 +00:00