From 64b2b8d59acac0332e61b6622e7d16a300bdce3e Mon Sep 17 00:00:00 2001 From: westcott Date: Wed, 8 Dec 2010 16:52:46 +0000 Subject: [PATCH] get.oturep ifstream --- getoturepcommand.cpp | 26 ++++++++++++++------------ mothur | Bin 7748920 -> 7749216 bytes 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/getoturepcommand.cpp b/getoturepcommand.cpp index 44c58c3..9cc9973 100644 --- a/getoturepcommand.cpp +++ b/getoturepcommand.cpp @@ -560,14 +560,15 @@ int GetOTURepCommand::execute(){ //********************************************************************************************************************** void GetOTURepCommand::readNamesFile() { try { + ifstream in; vector dupNames; - m->openInputFile(namefile, inNames); + m->openInputFile(namefile, in); string name, names, sequence; - while(!inNames.eof()){ - inNames >> name; //read from first column A - inNames >> names; //read from second column A,B,C,D + while(!in.eof()){ + in >> name; //read from first column A + in >> names; //read from second column A,B,C,D dupNames.clear(); @@ -580,9 +581,9 @@ void GetOTURepCommand::readNamesFile() { fasta->push_back(dupNames[i], sequence); } - m->gobble(inNames); + m->gobble(in); } - inNames.close(); + in.close(); } catch(exception& e) { @@ -594,14 +595,15 @@ void GetOTURepCommand::readNamesFile() { //read names file to find the weighted rep for each bin void GetOTURepCommand::readNamesFile(bool w) { try { + ifstream in; vector dupNames; - m->openInputFile(namefile, inNames); + m->openInputFile(namefile, in); string name, names, sequence; - while(!inNames.eof()){ - inNames >> name; m->gobble(inNames); //read from first column A - inNames >> names; //read from second column A,B,C,D + while(!in.eof()){ + in >> name; m->gobble(in); //read from first column A + in >> names; //read from second column A,B,C,D dupNames.clear(); @@ -612,9 +614,9 @@ void GetOTURepCommand::readNamesFile(bool w) { nameFileMap[dupNames[i]] = name; } - m->gobble(inNames); + m->gobble(in); } - inNames.close(); + in.close(); } catch(exception& e) { diff --git a/mothur b/mothur index a3b2f0f971187f4342c63426b9ec87b924c1f70d..0f23015f75ecfda6bb2b8573acf2502237933abc 100755 GIT binary patch delta 1554707 zcmZ_1c|aA_`}lun5Wy8(kR2`xih>F%u81h07sXskQB$If($vJ1)Iu*V_nmaRg`Q|^ zkw^nG}=Bl-_L${BJUiZ@u<>OuLf4Qz$jR9VMDdM5HpTU1|cS_IY2WX7k0*%CPpXH#zl-=A7z!Q*>5i+7;g8V^*Nl?Ol6JRu8m%Z*Vn(yRN|spL%vTvGwl@p&$l8@oWauI;k8x)a z5Wa=iDjIX2mR)I*(IL!^QW`kF-y1>V0=lNQ6+N2wNvP_n zn6jRG!Iab9WO85jf@#k{)r2naf`3N}7MTV^Dc8;!rYU}ksTHJ+r^4)5bnXjKfrVmY z^FZfWEiz1@;$ZV3?%%x^{B`qJ%hp8pJUwE_`RF3y?vmpi{|poY!@KN0;L^KikeMn2GClJLw z*&WvncQ}(fn6M&|!bE~W6cSMuNixhx)P}P^t{MIyB8!Rroq)(=!e$WBM3{l-9`A=h z3oQX7p$RxtVL;?~4OgI}vG!gl|#nvA2 zejNcQ?!n%uFudVJ-snwcyn;ju6A1=UNJLpLB0`a)*XadYE;sqpPm_n)*XadZkWX3%tVweaqh?-h7qokV%ZO0-?JF_n? z7``ANwVPNI!@zO|(hMMz024@nnfmY6pd)|@XM>0)BEKsU%aAAzVrQH;obiyH(N%11 zAMb}i3IhoSP)I;oh;WUK_iF_}t(jeM&Ts_*Ss|n&6^T41Yz7fcgqaBii5MnA45Frn zd=V@{JI4F91fVpKeNkrkf`C*2psI05EN3FkATo(CF>$d45CKd$8$>h_`CWv?Bi%A(6*~%^;$Q zFn1P5I>q}T5W_%-0o2?lX9SUwPh5Z~^Oe7dYArWPPL>zYpqSlAKaoX?(5m`*6 zBaz31%^;$QFb9ew-tm42#4r$I05x~X8v&%`^JYMldb2nFGQ2@VDie<)v7CuCgUBSp z#KbKpAOe_hHi&2<^8JOyH{K6{VlVc_pN2Q8$s7J;Mt>wym`E^)LL$oii1K;5;07K7(~q-a)&QzIiLVh+KJuqhv5z)Qki%fiRDbB z8AK)#CMKMb2w=k5Afk!L_aQAGnSdzvV1N8>_~SPDgNac{q%e_S5QRjPd6NuTmk$2u z$o}}v@COlDOk^XG$ArxwqKPmw(F2JXCPECN<`((Gi?sYu3q)xL_Q$V=KZr7g(6A1=UNJLpDl2KIy zL~T3v$1jFIh{$4MEfRT5*bE|?2s0CXkceR-#2{+^C4YF3mXi;FD0OFl{A~Dxh*TyP zA+el^G=s<_!o-9J5&=v&8$>h_`5j5im-m4vc4L2>F#K_Y{J}&r5-Ch17(^ivWgSSy z-FraPwq<`DH~c|F787qHk;jD1AfkydGcg#67$!mtqNa-c(Vn!Nz6(TY8}`RB!yiPX zGLebIawgIYB9jOc6aGj9FyU+v(M068BQ3?%KoqxTfBaLZ;|IeZ zM5HpY8j0mhq!~me5hf-=kO*MH*&w2c$Ztzp4&4Hx815?JE_3tuhCi;6KbUwHi4-Oh z45E;TvNj~c6^UB7BLo?jjvD?TB8!QSZvv6Wgv}tLi7+!U8i^PtLJXqjD*2-|X{q=Z zh*G%Y11$%S82%t4m5JAoSk6S6L1YqPVxlJ!0Zcd>L^Kiktw_tU8$cAp{T%w^u;Gsi z@&^<1kw{@8!5|8WC~HYF+>xk-dolFKA;TX;WHGU;3Wz)=Yz7fcgqewnNW?G^Vh}a| zkUv_GmYbD8l)|kR`s1MC4)Ex%s}q8RR^ z&>!C!{wODZFtHek6ebc3qL7F(7n0$HL@nF~p+627{vaZYiLb8#k;jD1AfkydGcgT` z7$!mtqDGQGnv<3XSAi&n+Z^=Aw}wB6NM+(ZB$hLgW)PV~n3x!fL;w@c1`$m}zB6el ztpK7JZe!3N`wf3wA%8GoMIwcX1cN9fqO2LoFe6b5_aNwx62l)vWHGV-A0YCWuo*-& z5oRFZ?jC^{20{#=<}$g%iIl9xWv&!%G0+|R40jNb%0wR|mNSuN5Sc`nm^g`xSO62w z1`$m}zDimaAyEvs5a^C#!yT8%9ZYy2k-|iRK@<{ErjU#;aS^M9{Xe>+$Z!V{Sxh7& zk;jD1AfkydGjSIeu^1*o45H>D`NKq7-bSJnw)g0dLcK$_A>SAdxj+ul5r0Hd7)daYLPE-FSxPakW3{mR zMwje0TtY~ejy!=#9wRmbi6+FXBPK**7zr_un)Bq8hpcELE@h>#zecZoZFq%{R2>CkW4~MI#Pj)S^y)?1`!* zU?7Erl-*@1$8cS%h5aY`$bYv(ZDU2i-NFgC*|FV=)T<2@CqTRh=j-aBe9%`G=s<_ z!lVmng-8G+&IS@qNd7g}^XU~piedYLUisMY${*wv9T|&A3L^;yQbOFlGQLPRPM=#rNZS zLcISu0E%I`Mvr`8c;qB`CkW4~M=Y?fVygvc~3^*G=Gy(bNz#{|W{7(Z>3~Ld3 zWP{<6uAddl?0YnpE z1{t#l#}N_3M2JDu93zjMWkYWK2|`L?fk2PEYj}i^R6^qXkyy?|nn7d|VFDt12onKJ zI2%MX5&5O8=GRjoq!=cDbjdr0OMW7k=tu@4DU2i-NFgC*XJ9&Vi}ORG7N%|V$lHcT zh{!r4jy#*xVqid+Df_Ve;EeE}^+ad)`_ZO<-FlS#>(b#N)HyRJY$1H)i)yXWtbe&poLgdReS_E?QmlvN-hIVD-Ifq0X78-hD|-o)fRC z)#AN5!2y5YF{Dqm#nz#8cL!gmw@H6Vl+HuD)|yberEl`? zr~9?ooH5Pxuf;9AL_E2`Qyhl;XEKCLPf!PBh~5hps5Mn$(}IEOw^icr1zpwAi$t>* zCUu^10Glc5Czv}e*=OZn-zA%}4_NHWc3M_ddRc}HUD!>${KE4sKUg@;gw0}KC~m$G z)N+X)OX`3u9W2AZ*NcAcuK?+`vg%)I zNRI{c#hDj7t7GR2W$^&D@SqsHI3no$^V3Z7Cm0W4XPes?xkHhu&Q%y0a!lA44|MJD z1Gwt2twcLZws^dKW*A0F(HXIPt%O9napR-CNuTGidt`+NCyF_>dVGjuUY_KDr3&u#WBj z0cVu|1&)V&NY8-u$XA2>oR7#9knr=Lk9eyiip7^php3Mhi1pkZ50KVizAgBGNJw)z6QLotYu3{iygO zGpy~e2hn*$!>)tu%Lj$~vd7iO_lkMT9(8laob1EcPmjoZUyI|*);XO#l&od_)3>8o zvb??1?}wAM?RD)thr>8Qr5}Bn4C5j&-ej6&$-eZcWz|(L3mD~ap3x5+o$X?=JJ0kL z!>t|LKlFiK;9;@9?9P^TKO_`uV9@V-z`Mtv>E#xJ^4{-f?uBm-5`9&y(?s6}=Om~Z!J?JEXnO;R^_ zi?vxj)#trMNmdt2qBmG>k2PDeZB-AkVQsP4zN;kE%yt)3?75U-A0a`858)F-E!nvy z;6`UZ7U~YQcJdZsD+1N?ULt9QmwLimJhP&!y53v7zT&YK6Tc$uao(b0g-_2bp4i^s zc_n3U&H(|5jto$AR(=BAF43_JWZB9mzEvRltc(eHsQ{gy03AOg-(oM4kS#Z1 zn$gb(4V~&Ka#x0`^Swkno3FV&sBp7ILN5n{hk8N%93$KlvlF~P!FW01OOa%Ip(AAd z1{`KtvYpU`5k(?vRqq}{z94lwLETP6-Aqg~X30TAeL8`H)%&$}*-A%oZB+{|6XciY zL3MJVKB-12pD#q))j{gv-6C>zP~eBVff<2S&i)Q+iPf;!2lAjCy39i?SRJa0PFR7* z`+Hyo>|B8-L0OXuJVVAfPXNf`NQc2+Dd&BT_IXU!QN2P3zQJkYicH=~LkIwWl5Z~Q zi1KH${0frO$U#-R!9iN{76`4@h6j!D5Vf`z-j%z+{znY^^(ki1&|@8h`G1|AzSxzl znZNDqsg19SZQeZNuv`lX3y!w%6xRQ>P@mr=Uj1M9&^Q$F5{PgMjQxK`P&ibFM^FbE z1P|Lc9R%H>hhQ@W6*mlmV>?BUS3<4-z&wZ*Eyar3mw`(z%l_ z)Iy!^-H3igrw1|pJ9o>_o~qNWkhVG|9R++m;{(2BQ%>$^a7LJppMf-R z#u1=#Zv(;?==A1B^usW&WqbwWhX6M-{!qsg8{r#u;g2$X z5NLO%N5S3%o5r^hy-=q^nEnoE+d&a22LP{v?gscwn88u_ zKFBe;h^I~;W%^s7aX$)lfljY&M3?vAYQD?#exOe2^$q6$75n_%a>;b9+NQBX#@&q-n>OPV~@n zK6Yts{q7S$vJYjSMALUco@M6Aic(yf-`R^f-$73)OmY-uvE+l(r$8m^K`4Dq#R0iL4vHP^6N+t4(qRGln<`4`=Kx2|riqMHL9)f(#-pu>bR?^9wid5C zCOQplldetJ7U(%T(J?(3)`zolJ~)d6Rmwt`Y?B<@^FffsUJwcwoPvW9usa4)>Qb13 z{!PlhF7Mc|(^N{YPeknN9nDoABV=P}2|(u&I-knW#gE0J*Sn2~f{J02oZgyjT3wRy zTcRT~*j;{wMQtT+tAB!xL!x83tK4j)T!s`Zu!p3#8Qxl)dEIlcS8JG1SCxSEHcJgI zv`{1!h(t&68r=U`h<0wFV~N=#U4e;}Z9fsi*M|7QYH_`lvGTZ}10RRk8n@c)YZ|Of<#l)P@{@+tNE?{Kl0GtwMp2Tf-J6MU)47u+^Fs?67 z9C||D7h-2lr*3O#im#NjtyCKiFzD&P0;jXw}@*woZt!L|4z005fNE}-?PIYk=fnu`LS(kK8+2Ptzye8VW^n)>L zvHQOdX^}fzXQ+YAh0B|x)ML%X_&2)^ul@ji1OxGkjQj?72H3h!aTZ2%dEFKM;G~?A)>phqK*dX7hCIYDnwH#K7EcYLT;eGPhgudHhc;&6$PASdOwVyp*JjIE(+!Ef{NEV@-zhSI_ z!ZdpkmXJO2chAz+ zDFdg!k1e>&OFqg0cR88^u5vg8u-CQ%=fkXp#h`S_RVY0-PxN_v^6=RAFejJ&^Ah-{ zU=QX#^uasIA_{NIYhtjx5kz_EXu}(M;^^D{k30f?Ps~1OsDOK>H=DiID1U=e#!Dq0fplX(4|Zr&RqH*wJ4FAhzzZ$1Jw(feA}kK))n-PI>Hhy167bL-Vh4jR0nQj(76N2=S7$$!#RuvPWEBQ z$=7pa)C5kG7iju~han&gcrx>S6iiK@g~k830X&sm3b_i++ zM_k+B-S(|bRAUUMRn~o;DlwHcpaL z!3}7B(A!jf)Ga+YOqJd7Dt6auc@ns+qDsg%Et+f*GvD{HmaeBFWspYAb*xF;T^2Wq zyUNcR;&Ks)tFwiIrQlU}RGP!NQw(WYP2%n{y-6H49bS-7eghX(d(j${Fb)!6=TxPQ zf6UuQbkA?E_FON9=6m{f#G<&#=>)qopqH=?SNT8_^Ygtunz3lA@1AwoENxcY7aQ^e z)Cu=RQNH(pbsE)_%B?s|`<#W8{GDFUAre{Z|v^d1GgG_Ph9yHj;f0|s;sQ zdsDaIXqcqSkI>TvTf_r$IvQ_rS|aU>&8vVS_1R8aay>F7M8#nyBl+FT?KTh+0Q?JC%>h53!IVw-*jF$A&7-&Bc`(wx6$1 z52$bEr0jD2=IW_-ydhl;0M7B5aODl@U-{zlhap|ZU`eng7;RxAQD8rv4~MJlk}o1R z_fo6Zi6=Mvsei5$*3I5gIoRi+;8yHKM(tobxaju(?--gd#7~<$tIw_zH#T>*4qL|p zyc!F@$9pn_b1HtXmrEO#wtDiP^~vBo95?b1?m3K`hb!oAj?~G&j0m9lh#uvH@)_c- zk4E%ajxl@DR>+}A@A)QicbU>8?kXQyD_U;pt@^JOL$>&-bva_{magg_Iby|@K=YS5 zq_^V8f6XJw>vKfOmX7Mm9Pv983Ev=Uw*-0);vzH_^a;RK2Iq)=Tg|>I=aqM9Xc)dZ zDt|-F-|DGudQYs`8mfNuhWLDI=K%x%)xDl=8`x+(uR821m%c%Dr17m!che}z+4o=3 z>SJ%UQ;z8RaliKe+@O&Kw@A%`aekVtiMbyKsw-~Lr1|aZB&G4#`GAs~pT=@{oACcm znoqnT&V1Z2qOUHw(KyXMF5kw93_4Kly`~-LQk59~iFZ^PN{8%&jq4Bn>+>o@9qr96 z*$qQ=`|IM3Pr9fdI>Z;B^c@g_AU(OYMce`vybp%PaF@?Gs50xZ*;gEj=%=x2*4yH_Pdlr5 zIpXzCUa^YO8QS4S9y`?7(dtx67-bX_M(KI>w=^gj@4-<$$FNZs3lcXI2lvTc8_A=?m