Commit Graph

92 Commits (main)

Author SHA1 Message Date
Heng Li b5b50ac8da r341: bugfix - wrong mate position
when one end is mapped with a score less than -T. Caused by the -T option.
2013-03-07 21:35:57 -05:00
Rob Davies 3d33ab063e Merge branch 'master' into master_fixes
Merged to master version b621d3a

Conflicts:
	Makefile
	bntseq.c
	bwa.c
	bwase.c
	bwaseqio.c
	bwtaln.c
	bwtindex.c
	bwtio.c
	bwtmisc.c
	bwtsw2_aux.c
	cs2nt.c
	fastmap.c
	khash.h
	kseq.h
	ksw.c
	kvec.h
	simple_dp.c
	utils.c
	utils.h
2013-03-01 09:37:46 +00:00
Heng Li e70c7c2a71 r284: amend cross-reference hit
I really hate this: complex and twisted logic for a nasty scenario that almost
never happens to short reads - but it may become serious when the reference
genome consists of many contigs.

On toy examples, the code seems to work. Don't know if it really works...
2013-02-26 00:03:49 -05:00
Heng Li 20aa848b3c r279: for PE mapq, consider the number of pairs
If there are a lot of proper pairs, it is more likely that the best pair is
wrong.
2013-02-25 13:00:35 -05:00
Heng Li 9957e04590 r278: don't perform too many mate-sw 2013-02-25 11:56:02 -05:00
Heng Li ee59a13109 simplified bwamem.h
Hide mem_seed_t and mem_chain_t. Don't expose unnecessary routines.
2013-02-24 12:17:29 -05:00
Heng Li b4c38bcc1c append fasta/q comment 2013-02-23 16:57:34 -05:00
Heng Li 17c123d65a pring paired-end SAM 2013-02-22 16:38:48 -05:00
Heng Li ba15b787cb rework PE mapq; don't know if better 2013-02-22 14:47:57 -05:00
Heng Li 6c1a113753 mate-SW for all high-scoring hits 2013-02-22 13:26:23 -05:00
Heng Li 38fc5c8822 reduce mapQ when a read is moved 2013-02-22 12:54:42 -05:00
Heng Li 6a16edc15e tuning PE mapQ 2013-02-22 12:47:26 -05:00
Heng Li c0093264de wrong logic: paired mapQ should <q_pe 2013-02-22 12:34:46 -05:00
Heng Li c5ce72f593 scoring pairs by score, not by errors
This is important for bwa-mem which does local alignment. A short exact match
is worse than a long inexact match. Also fixed a bug in approximating mapping
quality.
2013-02-22 12:10:20 -05:00
Heng Li ed08d08f36 fixed bugs caused by interger overflow 2013-02-22 11:17:31 -05:00
Heng Li dfc63acc11 bugfix: another ">" vs. "<" bug
That hurts, as I am going to reverse all these again!
2013-02-22 11:06:36 -05:00
Heng Li d5820177c6 bugfix: wrong mate-sw qry coor for rev 2013-02-22 11:02:14 -05:00
Heng Li 81fe6f8e38 bugfix: a typo leading to wrong pairing 2013-02-22 10:57:07 -05:00
Heng Li 58e4cc207f bugfix: 1) fill seedcov; 2) pairing not working 2013-02-21 21:26:01 -05:00
Heng Li a9cae8c9af minor changes 2013-02-21 10:39:17 -05:00
Heng Li 41624fb347 bugfix: choosing the worse instead of the best 2013-02-20 20:43:22 -05:00
Heng Li ea8f4f4d34 clean bill from valgrind 2013-02-20 20:26:57 -05:00
Heng Li 5626fe29b7 Well, at least output sth 2013-02-20 19:11:44 -05:00
Heng Li 688872fb1b code backup 2013-02-19 00:50:39 -05:00
Heng Li 66585b7982 code backup 2013-02-18 16:33:06 -05:00
Heng Li f0a6285aba perform mate-SW for some suboptimal alignments 2013-02-16 11:52:04 -05:00
Heng Li ea9fc7df48 keep the number of SW performed 2013-02-16 11:03:27 -05:00
Heng Li 8ee464478a matesw working; for testing only 2013-02-16 10:48:50 -05:00
Heng Li fe2236f6fe code backup 2013-02-16 10:09:30 -05:00
Heng Li 5f8c6efbc3 forbid x-bounary bns_get_seq(); code backup 2013-02-16 09:48:44 -05:00
Heng Li df1ff2b36e better and proper way to infer orinentation 2013-02-14 12:59:32 -05:00
Heng Li 688b524cdf code backup; tired.. 2013-02-13 23:55:56 -05:00
Heng Li 87d619a21f minor code simplification 2013-02-13 23:16:16 -05:00
Heng Li 604e3d8da1 code backup; to upgrade ksw.{c,h} 2013-02-12 16:15:26 -05:00
Heng Li 2fc469d0c9 code backup 2013-02-12 12:09:36 -05:00
Heng Li e5ab59db53 Multiple changes:
1. Removed bwa.{h,c}. I am not going to finish them anyway.
2. Updated to the latest khash.h, which should be faster.
3. Define 64-bit vector and 128-bit integer/vector in utils.h.
2013-02-12 09:50:28 -05:00
Heng Li 13288e2dcd code backup 2013-02-12 09:22:47 -05:00
Heng Li dcb190069a PE NOT working, yet 2013-02-11 16:10:14 -05:00
Heng Li 99907c98fb separated and improved SAM printing code
This is for the PE mode. The routines may also be useful for bwa-sw, but
probably I won't change the old code.
2013-02-11 15:29:03 -05:00
Heng Li b6006cbe9d skip orientations that are much smaller than best 2013-02-11 13:44:39 -05:00
Heng Li 4431e359e2 analyze isize distribution 2013-02-11 12:15:12 -05:00
Heng Li 59eaf650ac code backup 2013-02-11 10:59:38 -05:00