From 71320f99c5751c7c589fea9982079842b969db13 Mon Sep 17 00:00:00 2001 From: Jillian Rowe Date: Mon, 15 Feb 2016 10:42:19 +0400 Subject: [PATCH] commiting fixes for pull request --- bin/.python-version | 1 + bin/build_bithash | 2 +- bin/correct | 2 +- bin/count-kmers | 2 +- bin/count-qmers | 2 +- bin/cov_model.pyc | Bin 0 -> 6561 bytes bin/quake.py | 36 ++++++++++++++++++------------------ bin/quake.pyc | Bin 0 -> 10372 bytes 8 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 bin/.python-version create mode 100644 bin/cov_model.pyc create mode 100644 bin/quake.pyc diff --git a/bin/.python-version b/bin/.python-version new file mode 100644 index 0000000..7dceab0 --- /dev/null +++ b/bin/.python-version @@ -0,0 +1 @@ +2.7.10 diff --git a/bin/build_bithash b/bin/build_bithash index b0ec855..cc8197a 120000 --- a/bin/build_bithash +++ b/bin/build_bithash @@ -1 +1 @@ -../src/build_bithash \ No newline at end of file +../src/build_bithash.cpp \ No newline at end of file diff --git a/bin/correct b/bin/correct index 054125a..1d413de 120000 --- a/bin/correct +++ b/bin/correct @@ -1 +1 @@ -../src/correct \ No newline at end of file +../src/correct.cpp \ No newline at end of file diff --git a/bin/count-kmers b/bin/count-kmers index 5cf1171..58d9b50 120000 --- a/bin/count-kmers +++ b/bin/count-kmers @@ -1 +1 @@ -../src/count-kmers \ No newline at end of file +../src/count-kmers.cpp \ No newline at end of file diff --git a/bin/count-qmers b/bin/count-qmers index 810dc93..580c8ac 120000 --- a/bin/count-qmers +++ b/bin/count-qmers @@ -1 +1 @@ -../src/count-qmers \ No newline at end of file +../src/count-qmers.cpp \ No newline at end of file diff --git a/bin/cov_model.pyc b/bin/cov_model.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4240aaf878fe6f8c312313f844d6954dac48bff3 GIT binary patch literal 6561 zcmdT|&vP6{6@ERt`mw8(B}?*JavXaqu|YVIWTz5B9OF3HNt}=vF%FngVlU&Jkvyx_ z?C$ievj(YBlvAn7jWY+Tpo%JrOHR2^1qZkQe*gzkIr9hPoPzIrJ(4z#%T!D_Anm^G z>3;p=b-(X>uc!3sWOd==-~X^F#h-`Y3;5dKKt%W$X^U(bSu?Wb$(kpIwVt#~vQ|T#H6~8tBX~vH2D|)7PJ z%jvt?ZBnwcCO^P#(Gjgd&l1M}vE)-)`$$pCNv7p)SxkOVS~JpuMLKYH_kr^qmV8cH zhol@G74Oy8@;WV|3Gle9i;v=*uGkZheH(7XXZ@4ith3?2)zP!I*Zp(NPCw19zn-+? z^OncEw3MWIUPdX3ZJtk{pgN7stvIv!D4xS6Jq4!23Gz-BH}b3>=VRJsJ?yt#_gith zYgbYEU3T=}iL=<(k>bb?t&dsa4Q*KI`1!5a@7vh#toyxw*iQ00{_U{ckFEb!6zh;! zdQrM=In&Zo7Gf1RM-f-zlJh&=7-tUOPV?k1__dcHUQagTc5f8r|JmY&L(yj=4>vh)ovHpLpW8m?7y1YZrsFnk@LKHh;$bW|pn>X)VH7o-XRBMh9JXy7aGSIh4#;?zcjr(}gylcv9^ojTHxgLzZ*{l4m{x;rjM)I1M*|1@!l; zi$Uo~AVZOk)v>!_eoKc-EK#V7vv(ZQY#w2KsumBDe39O+t5!H`FEuMu^cAR9b+wa@ z)6DJqB7Q}MeHx{eTb-?VrIobXNtmv{b6PkayVAXr-|D0*-|vT;@yg94U4i#D)TU)L zajdN{NvH8^bu2S#YUU*Wy_06fn=#W~)vK6kbF5S`b#KAUm}B0gY0_5i9btQsy`Lxo zhbMy<_G8DT>t~di5kgAR@<^nJA`9R$a=K>>e`(3K!`m@_=?Y*^{~VA%bf%gA z)OkN!Zg)1+qb&Hky~wy9%u;X?*U$wYYbguUjaW;~Hqh<@K>sEjs2N+U4XcV2x+!>k z)3KzM8d2i>_)UO0nCIa1hj+px?`_I%FdV1@D)fj|R4M~=8ydO` zyQ-bO+mWvNsEUVn`hch=Vyq7#-l&;1bvXSb+?u6%Zwj(%9ye9*G1DYONCq@t9sN%@ z8aT84z~DIH#e-wR{y8mhS?7k&qOrFC|AU%32&y+nB)dYUK$##Ilk`B>V;_2b@C}Mn6i-k*NkQBN%M>dRi*#0pwr5!)&jcEt zSW5d_4ZzF>XYioYM#=3nr%x;HFl(f(iddAXLgavs#$5_$_E-VVm~qYA!*eSkjM2RbeJ=uL8k}VfeNu3s#}~du2*_#B~!U0 zfSlj(WD^|sv`2<~Kqrt5mvBUP7+W$fb)29n>Ts0>!4-AA_m$as(FK)bbCv$exb?Ph z{nI5mZY;J0)N)lL@et|Uk7^j1z8uw@j2Q2gZ0@-O{GVn1mIUdTH_Txb=+_d{#ieGi zj%r0NzP!;?HKt3|#iNh`b6Ll?b1acNHOqGw-Y|Cz{7tqgL4J#+=O{>L_hnd3zCKU0 z!2*?!P&`7RQ}br7L>YE*w}^s6yU$sihFh^_JFQNVF4C%dI2w)&lQ;b&U8PzV4^~SiMA6ALFG0F%5|e+rh=i7r?LC&vr}5<{h6K zXrjd4s&kIlk-=%QHAr`t(2r|QrR>dA&W(nlnft$Tx%X=q2`VypUL(PN$5TZl_*^f> z1H3(Rqku-zdJzeVsv`5Nazpl$x(OM~GvT^)9VsWsc>LF_IENW|ks(oI<3ZFz?5bvAS9aO;6K0GL>O^+M zOn3=~-P~u=q7F$O;?OR;e(dgT2qK8HIBzt;LcCB!aKJQJ64`anOl4QPl4Dn_8!tbI zsNxERtJ43RY&rdZ!(LbA423#|zJnv} z2d`6HfG8$mAj2f6_$uxII_NnZcptB-X^f?>*3D^Ct5r@^j@Qmq&Q_kOjMdD)0Y} %s' % (' '.join(fq_files), quake_dir, k, quality_scale, ctsf), shell=True) + p = subprocess.Popen('cat %s | count-qmers -k %d -q %d > %s' % (' '.join(fq_files), k, quality_scale, ctsf), shell=True) else: - p = subprocess.Popen('cat %s | %s/count-kmers -k %d > %s' % (' '.join(fq_files), quake_dir, k, ctsf), shell=True) + p = subprocess.Popen('cat %s | count-kmers -k %d > %s' % (' '.join(fq_files), k, ctsf), shell=True) # all zipped elif sum(fq_zipped) == len(fq_zipped): if ctsf[-5:] == '.qcts': - p = subprocess.Popen('gunzip -c %s | %s/count-qmers -k %d -q %d > %s' % (' '.join(fq_files), quake_dir, k, quality_scale, ctsf), shell=True) + p = subprocess.Popen('gunzip -c %s | count-qmers -k %d -q %d > %s' % (' '.join(fq_files), k, quality_scale, ctsf), shell=True) else: - p = subprocess.Popen('gunzip -c %s | %s/count-kmers -k %d > %s' % (' '.join(fq_files), quake_dir, k, ctsf), shell=True) + p = subprocess.Popen('gunzip -c %s | count-kmers -k %d > %s' % (' '.join(fq_files), k, ctsf), shell=True) # mixed- boo else: @@ -253,16 +253,16 @@ def jellyfish(readsf, reads_listf, k, ctsf, quality_scale, hash_size, proc): # none zipped if sum(fq_zipped) == 0: if ctsf[-4:] == 'qcts': - p = subprocess.Popen('%s/jellyfish count -q --quality-start %d -c %d -o %s.db -m %d -t %d -s %d --both-strands %s' % (jellyfish_dir, quality_scale, ct_size, output_pre, k, proc, hash_size, ' '.join(fq_files)), shell=True) + p = subprocess.Popen('jellyfish count -q --quality-start %d -c %d -o %s.db -m %d -t %d -s %d --both-strands %s' % (quality_scale, ct_size, output_pre, k, proc, hash_size, ' '.join(fq_files)), shell=True) else: - p = subprocess.Popen('%s/jellyfish count -c %d -o %s.db -m %d -t %d -s %d --both-strands %s' % (jellyfish_dir, ct_size, output_pre, k, proc, hash_size, ' '.join(fq_files)), shell=True) + p = subprocess.Popen('jellyfish count -c %d -o %s.db -m %d -t %d -s %d --both-strands %s' % ( ct_size, output_pre, k, proc, hash_size, ' '.join(fq_files)), shell=True) # all zipped elif sum(fq_zipped) == len(fq_zipped): if ctsf[-4:] == 'qcts': - p = subprocess.Popen('gunzip -c %s | %s/jellyfish count -q --quality-start %d -c %d -o %s.db -m %d -t %d -s %d --both-strands /dev/fd/0' % (' '.join(fq_files), jellyfish_dir, quality_scale, ct_size, output_pre, k, proc, hash_size), shell=True) + p = subprocess.Popen('gunzip -c %s | jellyfish count -q --quality-start %d -c %d -o %s.db -m %d -t %d -s %d --both-strands /dev/fd/0' % (' '.join(fq_files), quality_scale, ct_size, output_pre, k, proc, hash_size), shell=True) else: - p = subprocess.Popen('gunzip -c %s | %s/jellyfish count -c %d -o %s.db -m %d -t %d -s %d --both-strands /dev/fd/0' % (' '.join(fq_files), jellyfish_dir, ct_size, output_pre, k, proc, hash_size), shell=True) + p = subprocess.Popen('gunzip -c %s | jellyfish count -c %d -o %s.db -m %d -t %d -s %d --both-strands /dev/fd/0' % (' '.join(fq_files), ct_size, output_pre, k, proc, hash_size), shell=True) # mixed- boo else: @@ -283,22 +283,22 @@ def jellyfish(readsf, reads_listf, k, ctsf, quality_scale, hash_size, proc): hash_size *= max_db # merge db - p = subprocess.Popen('%s/jellyfish qmerge -s %d -m %d -o %s.dbm %s' % (jellyfish_dir, hash_size, k, output_pre, ' '.join(['%s.db_%d' % (output_pre,i) for i in range(max_db)])), shell=True) + p = subprocess.Popen('jellyfish qmerge -s %d -m %d -o %s.dbm %s' % (hash_size, k, output_pre, ' '.join(['%s.db_%d' % (output_pre,i) for i in range(max_db)])), shell=True) os.waitpid(p.pid, 0) - + # rename file os.rename('%s.dbm_0' % output_pre, '%s.dbm' % output_pre) else: # merge db - p = subprocess.Popen('%s/jellyfish merge -o %s.dbm %s' % (jellyfish_dir, output_pre, ' '.join(['%s.db_%d' % (output_pre,i) for i in range(max_db)])), shell=True) + p = subprocess.Popen('jellyfish merge -o %s.dbm %s' % (output_pre, ' '.join(['%s.db_%d' % (output_pre,i) for i in range(max_db)])), shell=True) os.waitpid(p.pid, 0) # produce actual counts if ctsf[-4:] == 'qcts': - p = subprocess.Popen('%s/jellyfish qdump -c %s.dbm > %s' % (jellyfish_dir, output_pre, ctsf), shell=True) + p = subprocess.Popen('jellyfish qdump -c %s.dbm > %s' % ( output_pre, ctsf), shell=True) else: - p = subprocess.Popen('%s/jellyfish dump -c %s.dbm > %s' % (jellyfish_dir, output_pre, ctsf), shell=True) + p = subprocess.Popen('jellyfish dump -c %s.dbm > %s' % ( output_pre, ctsf), shell=True) os.waitpid(p.pid, 0) diff --git a/bin/quake.pyc b/bin/quake.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c2435d4cc63e6d1146469a91967b35a84653f308 GIT binary patch literal 10372 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 AzW@LL literal 0 HcmV?d00001