diff --git a/PALMER.v1.7.cpp b/PALMER.v1.7.1.cpp similarity index 100% rename from PALMER.v1.7.cpp rename to PALMER.v1.7.1.cpp diff --git a/README.md b/README.md index ef48a3b..c4caa38 100644 --- a/README.md +++ b/README.md @@ -127,16 +127,22 @@ Nucleic Acids Research, 2019, gkz1173, `https://doi.org/10.1093/nar/gkz1173` * arthurz@med.umich.edu ## Logs +**Ver1.7.2** Nov.28th.2020! Happy Thanksgiving!! + +* Improved HIFI reads calling!! +* A couple of major bugs fixed!! +* Improved running time!! + **Ver1.7** Nov.11th.2020! Happy Singles Day & happy shopping!! -* Enable HERV-K calling!! -* Enable specific region calling!! -* Enable cram file calling!! +* Enabled HERV-K calling!! +* Enabled specific region calling!! +* Enabled cram file calling!! * Minor bugs fixed. **Ver1.6.2.Enhanced** Sep.27th.2020 by Jixing Guan -* Optimize PALMER and make samtools as build-in lib +* Optimized PALMER and make samtools as build-in lib **Ver1.6.2** May.19th.2020 diff --git a/scp/3_read_masker.cpp b/scp/3_read_masker.cpp index a807dd2..d01658e 100644 --- a/scp/3_read_masker.cpp +++ b/scp/3_read_masker.cpp @@ -236,6 +236,11 @@ int ReadMasker(string WD_dir){ seq[k+x]='N'; } } + else if((bit-number)end){ + for(int x=start-bit+number;x!=end-bit+number+1;++x){ + seq[k+x]='N'; + } + } k=k+number; } else if(cig=='D'||cig=='N') {bit=bit+number; diff --git a/scp/6_TSD_seq.cpp b/scp/6_TSD_seq.cpp index 787a415..9cd7d98 100644 --- a/scp/6_TSD_seq.cpp +++ b/scp/6_TSD_seq.cpp @@ -310,8 +310,8 @@ int tsd_module(string WD_dir, string t, int tsd_index){ if(je2>loc[i][6]) je2=loc[i][6]; int l1,l2; - l1=je1-js1+1; - l2=je2-js2+1; + l1=je1-js1+1+0.5*BIN_5; + l2=je2-js2+1+0.5*BIN_5; char *right_j; right_j=new char[l2]; char *left_j; diff --git a/scp/7_FP_ex.cpp b/scp/7_FP_ex.cpp index 622c2f5..0a32e68 100644 --- a/scp/7_FP_ex.cpp +++ b/scp/7_FP_ex.cpp @@ -367,12 +367,13 @@ int fp_ex(string WD_dir, string fasta, string chr, string t, int tsd_index){ */ int fix_5; //fix_5=1+loc_tsd[w][4]-BIN_5+J_BIN; - if(BIN_5>=(info[i][3].length()-J_BIN_mer)) fix_5=1+loc_tsd[w][4]-BIN_5; - else if (BIN_5<(info[i][3].length()-J_BIN_mer)) fix_5=1+loc_tsd[w][4]-BIN_5+info[i][3].length()-J_BIN_mer-BIN_5; + if(BIN_5>=(info[i][3].length()-J_BIN_mer)) fix_5=0; + else if (BIN_5<(info[i][3].length()-J_BIN_mer)) fix_5=info[i][3].length()-J_BIN_mer-BIN_5-1; + int fix_3; - if(BIN_3>=info[i][4].length()) fix_3=1+loc_tsd[w][5]-BIN_3; - else if(BIN_3=info[i][4].length()) fix_3=0; + else if(BIN_3"+name_tag_1+"\\\\n"+(fasta5_str)+"\\\") -subject "+ref_junc_file+" -dust no -outfmt \\\"7 std\\\" |grep -v \\\"#\\\" | awk '{if(\\\$3>=80&&\\\$4>=60&&(\\\$10-\\\$9)>0) print \\\"1\\\"}' |wc -l \""; + string sys_3_blast = "bash -c \"blastn -evalue 0.05 -task blastn -query <(echo -e \\\">"+name_tag_1+"\\\\n"+(fasta5_str)+"\\\") -subject "+ref_junc_file+" -dust no -outfmt \\\"7 std\\\" |grep -v \\\"#\\\" | awk '{if(\\\$3>=80&&\\\$4>="+fasta5_str_length+"&&(\\\$10-\\\$9)>0) print \\\"1\\\"}' |wc -l \""; //> "+WD_dir+"read_result_junc_fake.txt"; //cout<"+name_tag_2+"\\\\n"+(fasta3_str)+"\\\") -subject "+ref_junc_file+" -dust no -outfmt \\\"7 std\\\" |grep -v \\\"#\\\" | awk '{if(\\\$3>=80&&\\\$4>=60&&(\\\$10-\\\$9)>0) print \\\"1\\\"}' |wc -l \""; + string sys_3_blast_2 = "bash -c \"blastn -evalue 0.05 -task blastn -query <(echo -e \\\">"+name_tag_2+"\\\\n"+(fasta3_str)+"\\\") -subject "+ref_junc_file+" -dust no -outfmt \\\"7 std\\\" |grep -v \\\"#\\\" | awk '{if(\\\$3>=80&&\\\$4>="+fasta3_str_length+"&&(\\\$10-\\\$9)>0) print \\\"1\\\"}' |wc -l \""; //> "+WD_dir+"read_result_junc_fake.txt"; //cout<