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

Epic alignment changes #41

Merged
merged 37 commits into from
Sep 7, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
376ec4f
setting up indexer to use one reference
Mar 13, 2014
26892c3
redoing indexing script to make only one index
Mar 14, 2014
1ac1d9a
cleaning up index script
Mar 14, 2014
39646c4
single ends new alignment working
Mar 15, 2014
f22b7ee
paired end working
Mar 15, 2014
fe895f2
Merge branch 'master' of https://github.com/mgymrek/lobstr-code into …
Mar 15, 2014
e56939e
removing code for next best period checking
Mar 15, 2014
9df9187
removing align debug info
Mar 15, 2014
9d15cc0
updating tests. NOTE: still need to change allelotyper (and tests) to…
Mar 15, 2014
d889874
adding missing files
Mar 16, 2014
1356e70
making allelotype deal with new index
Mar 18, 2014
027334d
moving alignment utils to a separate module
Mar 19, 2014
457a900
speeding up alignment by not allow gaps in flanks
Mar 19, 2014
9e787a8
merging in alignment speedups. traumatizing git merge
May 31, 2014
dc23b08
fixing stitching problems
Jun 3, 2014
9b2cce5
fixing stithcing substr bug
Jun 3, 2014
808bfce
fixing thresholds to fix alignment problems with new reference
Jun 16, 2014
c1a5332
changing stitching threshold so tests still pass
Jun 16, 2014
e17fb63
resolving merge conflict in main_allelotype
Sep 6, 2014
7ecfd63
deleted inproperly merged code in GetSharedAlns
Sep 6, 2014
cbf74f7
adding error message in case people try to use the old index format
Sep 6, 2014
c8c7595
get rid of empty for loops that were for debug messages and didn't ge…
Sep 6, 2014
3f36669
added tag to annotate reads spanning more than 1 STR
Sep 6, 2014
8e5995c
getting rid of repseq in alignment step
Sep 6, 2014
8584996
getting rid of fftw calls in strdetector
Sep 6, 2014
1216aeb
getting rid of fftw
Sep 7, 2014
e513918
fixing alignment: accidentally deleted line checking if alignment was…
Sep 7, 2014
c980cdf
getting rid of unused runtime parameters
Sep 7, 2014
2c82814
getting rid of blas directory
Sep 7, 2014
2870430
get rid of cached window generator
Sep 7, 2014
8c0c8f2
getting rid of unused functions in common.h
Sep 7, 2014
bb7555b
putting back in part of strdetector setting ms nucleotides
Sep 7, 2014
70579d9
fixing merge conflict in makefile where I had removed fftw flags
Sep 7, 2014
72a0b0b
removing out of date data directory
Sep 7, 2014
232c344
added link to new index to message printed if user tries to use old i…
Sep 7, 2014
9e731e4
updating readme
Sep 7, 2014
8a07576
removing data files from Makefile
Sep 7, 2014
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ test.aligned.stats
test.allelotype.stats
test.post
data/strinfo.hg19_1to6.tab
test_data/*

Makefile.in
aclocal.m4
Expand Down
13 changes: 1 addition & 12 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,12 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

DATA_FILES = \
data/lobstr.allelepriors.hg19.min50.tab \
data/trf.ucsc.hg19.filtered.bed \
data/trf.ucsc.hg18.filtered.bed \
data/strinfo.hg18.tab \
data/strinfo.hg19.tab \
data/vcf_positions_to_exclude_hg18.tab \
data/vcf_positions_to_exclude_hg19.tab


EXTRA_DIST = reconf configure \
config/git-version-gen \
config/gen-coverage-report.sh \
config/rebuild-coverage.sh \
lobSTR.rb \
$(top_srcdir)/.version \
$(DATA_FILES)
$(top_srcdir)/.version

SUBDIRS = m4 src scripts models tests
ACLOCAL_AMFLAGS = -I m4
Expand Down
6 changes: 5 additions & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
For full documentation, see the lobSTR website: http://lobstr.teamerlich.org/
For full documentation, see the lobSTR website: http://lobstr.teamerlich.org/

NOTE: the git repository is currently under construction as we are working on lobSTR v3. This release contains major changes to our STR calling algorithm ans is in *alpha* mode. Use at your own risk. Stable lobSTR releases can be found on the lobSTR website.

lobSTR v3 requires a new index and will not work with previous indices. The new hg19 index can be found here: http://files.teamerlich.org/lobstr/v3/ref/lobSTR_v3_hg19_resource_bundle.tar.gz.
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ AC_PROG_INSTALL
PKG_CHECK_MODULES([GSL],[gsl])


PKG_CHECK_MODULES([FFTW], [fftw3])
AX_PTHREAD([],[
AC_MSG_ERROR([Pthread support is required for LobSTR])
])
Expand Down
184,316 changes: 0 additions & 184,316 deletions data/lobstr.allelepriors.hg19.min50.tab

This file was deleted.

240,139 changes: 0 additions & 240,139 deletions data/strinfo.hg18.tab

This file was deleted.

239,234 changes: 0 additions & 239,234 deletions data/strinfo.hg19.tab

This file was deleted.

Loading