diff --git a/align.h b/align.h index 7a2da1a..31787fd 100644 --- a/align.h +++ b/align.h @@ -14,7 +14,7 @@ using namespace std; -const unsigned int FIXSIZE=SEGLEN*FIXELEMENT; +const unsigned int FIXSIZE=SEGLEN*FIXELEMENT; typedef gHit HitArray[MAXHITS+1]; typedef HitArray HitMatrix[MAXSNPS+1]; @@ -35,7 +35,7 @@ class SingleAlign { int TrimLowQual(); void ConvertBinaySeq(); int CountSeeds(RefSeq &ref, int n, bit32_t start); - + inline void CountMismatch(bit64_t *q, bit32_t offset, bit64_t *s); void ClearHits(); int RunAlign(RefSeq &ref); @@ -44,7 +44,7 @@ class SingleAlign { void StringAlign(RefSeq &ref, string &os); void Reverse_Seq(); void s_OutHit(int chain, int n, bit8_t nspsn, gHit *hit, int insert_size, RefSeq &ref, string &os); - + //by yxi void SnpAlign(RefSeq &ref, bit32_t mode); int TrimAdapter(); @@ -55,7 +55,7 @@ class SingleAlign { inline bit32_t MismatchPattern0(bit64_t *q, bit64_t *s, bit32_t seglen_offset); inline bit32_t MismatchPattern1(bit64_t *q, bit64_t *s, bit32_t gap_index, bit32_t seglen_offset); bit32_t GapAlign(RefSeq &ref, bit32_t mode, bit32_t seed_pos); - //int MatchGap(bit32_t mmi1[], bit32_t mmi2[], bit32_t shift); + //int MatchGap(bit32_t mmi1[], bit32_t mmi2[], bit32_t shift); inline bit32_t AddHit(RefSeq &ref, bit32_t w, bit32_t mode); gHit int2hit(RefSeq &ref, gHit gh, int gap_size, bit32_t gap_pos); @@ -82,12 +82,12 @@ class SingleAlign { bit64_t tmp_seq, tmp_reg; bit32_t end_element, end_offset; SeedArray xseeds[2][MAXSNPS+1]; - bit32_t xseed_array[2][FIXSIZE-SEGLEN], xseedreg_array[2][FIXSIZE-SEGLEN]; + bit32_t xseed_array[2][FIXSIZE-SEGLEN], xseedreg_array[2][FIXSIZE-SEGLEN]; bit32_t x_cur_n_hit[2][MAXSNPS+1], *_cur_n_hit, *_cur_n_chit; bit32_t xseed_start_array[2][MAXSNPS+1]; - set *hitset, *ghitset; //, *chitset; - pair xseedindex[2][MAXSNPS+1]; + set *hitset, *ghitset; //, *chitset; + pair xseedindex[2][MAXSNPS+1]; bit32_t mm_index[2*MAXGAPS+1][MAXSNPS+1]; char cigar[16]; bit64_t total_candidates, total_reads, total_seeds; @@ -103,7 +103,7 @@ class SingleAlign { //local variables string::iterator _sp; string::reverse_iterator _sq; - + char _ch[1024]; pair seg_info; char _mapseq[256]; @@ -120,11 +120,11 @@ inline void SingleAlign::CountMismatch(bit64_t *q, bit32_t offset, bit64_t *s) { else { if((tmp_snp=N_count+param.XM64((((*q)>>offset)¶m.XC64(*s)^(*s))&((q[FIXELEMENT])>>offset)))>snp_thres) return; for(bit32_t i=1;i>offset)¶m.XC64(s[i])^s[i])&(((q[FIXELEMENT-1+i]<<1)<<(63-offset))|q[i+FIXELEMENT]>>offset)))>snp_thres) return; + if((tmp_snp+=param.XM64(((((q[i-1]<<1)<<(63-offset))|q[i]>>offset)¶m.XC64(s[i])^s[i])&(((q[FIXELEMENT-1+i]<<1)<<(63-offset))|q[i+FIXELEMENT]>>offset)))>snp_thres) return; } /* tmp_snp=N_count; - for(bit32_t i=0;i<5;i++) { + for(bit32_t i=0;i<5;i++) { tmp=(s[i]<>(63-offset))>>1); if((tmp_snp+=param.XM64((q[i]¶m.XC64(tmp)^tmp)&q[i+5]))>snp_thres) return; } @@ -137,7 +137,7 @@ inline bit32_t SingleAlign::MismatchPattern0(bit64_t *q, bit64_t *s, bit32_t off bit32_t *mm_array; int i, j,jj, ss=0; //cout<<"in MMpattern() gap_index:"<