From 0a982a5ec8f74cf8bcaf923e4a747c863968858d Mon Sep 17 00:00:00 2001 From: pvtroshin Date: Thu, 16 Jun 2011 13:35:08 +0000 Subject: [PATCH] Improvements to the code git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4273 e3abac25-378b-4346-85de-24260fe3988d --- binaries/src/iupred/iupred | Bin 44056 -> 44056 bytes binaries/src/iupred/iupred.c | 24 ++++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/binaries/src/iupred/iupred b/binaries/src/iupred/iupred index e02c906b2d31d5286daf2c79fd35b2fb62aeb93e..ca86ab3f8796ecd72cfd313d180932042fef3717 100644 GIT binary patch delta 3685 zcmY*c3sh8P9=~@Oa7gn`>!>IQ*Sy(KfHV0TB5(#~Y^DaK!e>+%AW{e;GgB^-!#XoM z*DEl2D{0kYdwbGzuxX3zI5U8P?Y8Hz)|R!MmE1k2D=b*Hm2Qu_zwZvPyL0sW{lEX~ z`#-+NrSpQS^MWcolo~ifDZjwepT%x6hZ7TX*sKud$T9l(Ox3SCA{(?b)94X#tG)tb zzrGS9m;DIFKz0>IDZ3Hl#@jx@xa9UujOT7Anz!UMVeHHi=Z~F)0tkz3p>!|2R*Xv;)QB}_U;NAu-#rn z;JD)<=tXWQ-9l#dYj^_RuU$=`@IF64?7jcZ$yD;+SHkUEJDH0Afn`wac_5W2_LZMk zX*AFk;Kdif%K>GSy7idurCofA^--VZ8+|DO?9yZFBw(WEj8jq}>lTI`& z{)*o%pUgWEiT{kIpUE;)(f^A73~^$b1#Ku+ zLQ#4@VPplJ5N1Oty_(=I23K)4X(v9i;k@dO4sq$m)%3k$^TtJU?u9xUdhKnj-PXe0 z}vcJn5hepu{%P)Dy4KY8#R7@H9+@d?n^z@KQ^GVRu=)RlNz&gBPFk`|pm0(sHttF%iyYWh ziO|M&-HcJ&vKiy!EekQWwUjUNqWX5Bg3~b3x7EXHijppeWf_wkGI8){VqQ`GR57&g zehT)H$DW!-)BR%8?!~kz^8D`HBwvk&qGGR*o@X4Gh{DPt#u!(sN+-8mk2dXc%6hYwS#IWRE*dLru3Tk%f1PRE-;-!iFVM+>5_2i zlm_FT+br)P2`V-pR!)B4Cnx{Gx33Weaw#!~`j~@pQy&u?Nuf}KU7Bdh0eIg4N6JC6 zaww*28bt{$oK9jtmSsPPB&$%(=}k(cP3i2e@fM@i-} zGC26N(vlx#8KKR@#6~fJ4RT_^G&|oHy@-+xCf~@i6oLlzX%3&)3mz`*)Fq|VS0wc(B%5)P(DS&e9fFR-b^QV?jPa;My7(6Ivk2v!CU~A{|Kb-} zHjXh_RHd~9If*+iKG zN8rnWd!H09&GBA#MMvLv`hUfuKP#c#cso1}CNIaB$V|>;sd-91^T11FHfusEt@&s& zv1B}DPX3CN^Ovc_dhyOUe2L87ftSh5K1Zc30(uY}W7-)dGY5*JC4DyFFw;sdR{kn- z$-9bFt{_n_94Lt@X&r(KTfT>6mDn-+&j0*BSxvNO2W)(aEDAs-`m+ucqvW#|6!}T} z&rfDC*`94^SfV|S(@T}#N2{c7FDg6G$>-9r988{zF&FlO$v-b(sYS$-_EW?~t_zF5 zpLSIJC}oMqg6TSUhy;gSY!jTE#=*y(LYjCXn1O5eyWp)l&y)V^YR^Xh^<*Z?N>QHW z{_82CVeg{Ca!y|?hTbNW zpP;NEofzJ$OV2oI4P_`gP9~~@aYCn9us$os_NFIiv_mdl+&ep6>qHOq7GcJo;?Rs0 z(5@(=9YWe_A?L8j?8~ewFG_L!ARW|E?y#+oHU{ZYyss?Ss-yz-)C#Ag+B zVSC&9Y1UAAW-_?WqLfm>U=zq<6`3h8&6(@(gLl1?1dL!#P{kqZ95K9aw(nFr8cj}s zF^)IOI3|6$H*pY5*ab(4um{&2Uc?W;A1!CHT2XkMi*n8kg%&7~$K1+~V7m=N(;;Ns zCQP>qC2D^!ZSluxDGb9>Bx}a0%M*&#!hCS^`_jm$#NO0*7X}%4grUNUBF>r4^WFJ zhk#!LC7=P7pzs{K(33Qv0Xxb79NGszgpYe}8{rG^1B~OTy8s++mt`&9?yrG*U>qMM zb~PRw?X!5Zz;HbW17H`h2UvMXmdO`OH;_t3+?}$_0?U9VU^lP~sC^y_0$spX;4rWg zSoT|4?gqwzLqPU05+HLRg*TKvf&@~06cq+x0K;$;4uM0!ZNPXJ0s?lwj0_0Ah79oW zQ1&|Xfv#iF2X-At<$%-)=o3D$2gshpf|dRLZRz)E1)2g2NgNP(_X z$e1Xc#zLtujLEVYI1H==x_V&%jQ3#yg8c{#ICMsquK^8bVTbb?9zbb<=0Vs2yMa4_ zT_4Eu8^G2Nu?~^r;kzYmIvAIc3D7l;ObC91fPn13QK}hm94S25kxCyI|8)4?d1+9> xKA8G(pqAmkHex*TV$xe(*EIAs@%kG}Qm6h@6phDLrtUmwR!nwAb{uG{~ delta 3732 zcmY*c4RllG8NN47A%)r-Fk*pH0z^!uKq4KqVoOqP%8djmT7HUkmQm?|P->g1E5$I< zLN1r4ktjp#%;vq>3v>=|df=-xo*txUg?Oa*KiQvS$=S|Xjb`N~d`@MhP z`}6&zt(P^emo>rOl#=~S>??Wp&yg|uV0@wv+G2!0bck(F(|j5Tt<Yh(9&YsbV@$3xJyeqo~V{5j2XGe>Tu|}2pzp1JqEMq%Dy_N$sshUHR=$uz+vUcuD zjPK7q09NTdGgzVRd8Q=r-n_pG1~%WYL94e5ZA%xXCsq{FC?s#PR8u(1v0; z6qWbmMm*@a@N07Q+ccXxsX3md%$JZM=`&C~w~wVvosl-5snxG~jMwQ>v#h%r&lbQgx`Q zYQ7eFoi+0{gBkLVH3gXD*WSx+m8)wPfIeJnWk<_j)aHP`)3X8NcF%pRMLy{v&Na_` zHX_fe%LQFoH=lh#eyvVm+0ei0GPD%?sQL#q|1iia>Px9-N9t!1^wm!w_@RD6X}mw( ztTIVXv~Z!GYkW$>FtHxl7{0kqqcFq5bgpsr{|S?nzwa5cG;)pkLqd7;mWi~;?k(jA zZD7k(jQWPv7&kUd!PwkTGA$p~7o;+ijtjq|?b9-h(jQb+OtNX>6i-L;W$o5NXfN6d z`_P81BUx6KYo3|TGNBiqnVIBWt7Djm8*Y@0-H9l86Jnf7{4K=)c$cb1jLo1vAgYOY zQKE{8*Flt@sPL+ED?bc9L!5uwMNx)thiw4W>(4sJFj|xS7ZoF!{kH zo^y%a-@MVon+$Xhar?TsJ<;4QuIY;r3?ns|42tt(#4K&mg-7g$=SSeg2X+!Kc}xbB z#UO~h$!O=EJL71&&OOJQ(s-TQltwx%O*vkpbIYG?pX8m5syn6oO-ea@IN@8bte}v@ zFO>&ls47K30TQFq9F$DVn39Un;1s=Q6yd+Bx~;*KhM9xG9#P|~r3+$L_$}0}CwaQj$goiFNgkYR zWGZ6RDDXzbC@m=Zlm)SxcueUheh)L3_-|#>CzQ!mO6DjoUZ-R*;qpBOC)Q~A9qNhq zJd$%rB_^Gt=^_`n@}sI+2bQ3M`X!RfWNChsg~3i3gik>II7K0TYUjeKGp^Y=y|!PV z3u-5P*z>R%y=RaJha`RjKip)VVT4FlSxeWq=Kn;Tbfuqz6G6-`fMb{EN8cPr0i8-&x%QTlBZr$N8vK3=4uLw*Kb=#Ix+J|k(3HWxD3984 zw}GApPp$8!)>GoUne3VCyE!5#J9bR-mYK|jQubSg{_IS_*Ubtj$2_ORxUet|Eub&GXq1?H!7Ha7(bj@s+QhkN~)VXk4QouT;^dc!+j@j~l zcP7PMQlPWz;Oo~}*k-|dBy_d1UN-J<)m?a}$Udjjx z%_~Oo{<6$uICB+@K!EYEN-{^lHv3Lr7uGeqC|+dqHdBaoMxr)4d)@`EWhu^YVlV!2 zBF+sRGiwxYoOM9Cz5@pZh0DdEI!eNAxbE<)=*kYSs(!VM&YcaSR*0yp)+moh^&oVd zQpOBvG%qdG`Z`&=FUl(IaJ2*lu`Q8OXE~&0TDvsfj>!1DkGS1`rKOoS^wCAa4~jyw`8gK|2@u7WEu{ zUU2&}c5dG(JGZCPk$awN?2T!4zn26-yDr8V^D*vI?%0zU`_y z^iuUd3pO{IiL}B}>4qdiw}SHFcC{3#-get~BXc4foG`H?gY48 z$=t|8)TO9WK`w%%R!`JfqN<18J_#xq43+H?H7Ul;HO8rH-0rEN%;pX3-4AXyR;;hx zTvPFQjnVU~>c@@iYmJrbpM1Q^xTdzYZqxdzN~3#oRb}W{;0`tkX7c%#hvf;ud%cIT z6^l`p-e0S#pUQ(Z+JJiCai9&@3pDyvRRNYGdsy!3}b0k zRU>d4Fc;VdEC$+Mz=FUw;5MNCMOAGDZUY_$4g!0D#V;WNngba;(8c?azzFR9C2?% z!mliS2!R7F$5gc%7z75rAgYfeQefK&WK0Stu}}&OBdTfx>Z7V!4s7d$0dTMj3lN?{ zU_j=Ks@?#W1NAtM(QcF$Slt6VU?1>lVDC9qJqSGfA=V)|UevqNM}yIiOn_}ykqP0~ z2nbmGJxY}d$DvJoT2k2G$+uowJYIkj_QCLH0+oaRw$PgWuO!LA{g$I`H+1Y-`R2jd ZDZ_tR%GN{kQiMIWn3)iI;?SF#{{eW`|APPk diff --git a/binaries/src/iupred/iupred.c b/binaries/src/iupred/iupred.c index 2d8b274..c5e25a2 100644 --- a/binaries/src/iupred/iupred.c +++ b/binaries/src/iupred/iupred.c @@ -85,9 +85,10 @@ int main(int argc, char **argv) if (argc<2) { printf(" Usage: %s seqfile type \n",argv[0]); printf(" where type stands for one of the options of \n"); - printf(" \"long\", \"short\", \"glob\" or \"all\"\n"); + printf(" \"long\", \"short\", \"glob\". If no type is provided the program assumes all types\n"); exit(1); } + if ((path=getenv("IUPred_PATH"))==NULL) { fprintf(stderr,"IUPred_PATH environment variable is not set\n"); path="./"; @@ -105,8 +106,10 @@ int main(int argc, char **argv) printf("#\n"); printf("#\n"); - - if ((strncmp(argv[2],"long",4))==0) { + if(argv[2]==NULL) { + type=3; + } + else if ((strncmp(argv[2],"long",4))==0) { type=0; } else if ((strncmp(argv[2],"short",5))==0) { @@ -115,22 +118,23 @@ int main(int argc, char **argv) else if ((strncmp(argv[2],"glob",4))==0) { type=2; } - else if ((strncmp(argv[2],"all",3))==0) { - type=3; - } else { - printf("No disorder type is given assuming long\n"); + printf("Cannot recognise disorder type assuming long\n"); type=0; } + FILE *fasta; + + if ((fasta=fopen(argv[1],"r"))==NULL) { + printf("Could not open %s\n",argv[1]),exit(1); + } + /* Creating output files depending on the type */ createOutputFiles(type); - /* Read input file sequence by sequence */ - FILE *fasta; + SEQS *fastaseq; - fasta = fopen(argv[1], "r"); do { -- 1.7.10.2