20131112.patch 47 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592
  1. unchanged:
  2. --- ./phyml-20120412/src/help.c 2011-09-22 14:51:57.000000000 +1200
  3. +++ ./phyml-20120412-new-bak/src/help.c 2013-02-18 21:51:51.448662440 +1300
  4. @@ -96,7 +96,7 @@
  5. PhyML_Printf("\n");
  6. - PhyML_Printf("%s\n\t-q (or --sequential)\n",BOLD);
  7. + PhyML_Printf("%s\n\t-q (or --sequential)%s\n",BOLD,FLAT);
  8. PhyML_Printf("%s\t\tChanges interleaved format (default) to sequential format.\n",FLAT);
  9. PhyML_Printf("\n");
  10. unchanged:
  11. --- ./phyml-20120412/src/lk.c 2012-04-05 14:47:37.000000000 +1200
  12. +++ ./phyml-20120412-new-bak/src/lk.c 2013-02-19 10:22:22.665284529 +1300
  13. @@ -472,7 +472,7 @@
  14. phydbl site_lk_cat, site_lk;
  15. int sum_scale_left, sum_scale_rght;
  16. int fact_sum_scale;
  17. - phydbl max_sum_scale;
  18. + phydbl max_sum_scale,min_sum_scale;
  19. phydbl sum;
  20. int ambiguity_check,state;
  21. int catg,ns,k,l,site;
  22. @@ -481,11 +481,12 @@
  23. phydbl multiplier;
  24. int exponent, piecewise_exponent;
  25. phydbl tmp;
  26. - phydbl logbig;
  27. + phydbl logbig,logsmall;
  28. phydbl inv_site_lk;
  29. - logbig = LOG((phydbl)BIG);
  30. + logbig = LOG((phydbl)BIG);
  31. + logsmall = LOG((phydbl)SMALL);
  32. dim1 = tree->mod->n_catg * tree->mod->ns;
  33. dim2 = tree->mod->ns;
  34. @@ -555,7 +556,7 @@
  35. b->Pij_rr[catg*dim3+k*dim2+l] *
  36. b->p_lk_left[site*dim1+catg*dim2+l];
  37. }
  38. -
  39. +
  40. site_lk_cat +=
  41. sum *
  42. tree->mod->pi->v[k] *
  43. @@ -578,7 +579,7 @@
  44. b->Pij_rr[catg*dim3+k*dim2+l] *
  45. b->p_lk_left[site*dim1+catg*dim2+l];
  46. }
  47. -
  48. +
  49. site_lk_cat +=
  50. sum *
  51. tree->mod->pi->v[k] *
  52. @@ -588,8 +589,9 @@
  53. }
  54. tree->site_lk_cat[catg] = site_lk_cat;
  55. }
  56. -
  57. +
  58. max_sum_scale = (phydbl)BIG;
  59. + min_sum_scale = (phydbl)SMALL;
  60. For(catg,tree->mod->n_catg)
  61. {
  62. sum_scale_left_cat[catg] =
  63. @@ -606,18 +608,30 @@
  64. if(sum < .0)
  65. {
  66. - PhyML_Printf("\n. sum = %G",sum);
  67. - PhyML_Printf("\n. Err in file %s at line %d\n\n",__FILE__,__LINE__);
  68. + PhyML_Printf("\n== sum = %G",sum);
  69. + PhyML_Printf("\n== Err in file %s at line %d\n\n",__FILE__,__LINE__);
  70. Warn_And_Exit("\n");
  71. }
  72. tmp = sum + (logbig - LOG(tree->site_lk_cat[catg]))/(phydbl)LOG2;
  73. if(tmp < max_sum_scale) max_sum_scale = tmp; /* min of the maxs */
  74. +
  75. + tmp = sum + (logsmall - LOG(tree->site_lk_cat[catg]))/(phydbl)LOG2;
  76. + if(tmp > min_sum_scale) min_sum_scale = tmp; /* max of the mins */
  77. }
  78. -/* fact_sum_scale = (int)((max_sum_scale + min_sum_scale) / 2); */
  79. + if(min_sum_scale > max_sum_scale)
  80. + {
  81. + /* PhyML_Printf("\n== Numerical precision issue alert."); */
  82. + /* PhyML_Printf("\n== min_sum_scale = %G max_sum_scale = %G",min_sum_scale,max_sum_scale); */
  83. + /* PhyML_Printf("\n== Err in file %s at line %d\n\n",__FILE__,__LINE__); */
  84. + /* Warn_And_Exit("\n"); */
  85. + min_sum_scale = max_sum_scale;
  86. + }
  87. +
  88. + fact_sum_scale = (int)((max_sum_scale + min_sum_scale) / 2);
  89. - fact_sum_scale = (int)(max_sum_scale / 2);
  90. + /* fact_sum_scale = (int)(max_sum_scale / 2); */
  91. /* Apply scaling factors */
  92. For(catg,tree->mod->n_catg)
  93. @@ -651,12 +665,13 @@
  94. if(isinf(site_lk_cat))
  95. {
  96. - PhyML_Printf("\n+ site=%4d cat=%4d site_lk_cat=%G sum_scale=%d max=%G fact=%d expo=%d dbl=%G",
  97. + PhyML_Printf("\n+ site=%4d cat=%4d site_lk_cat=%G sum_scale=%d max=%G min=%G fact=%d expo=%d dbl=%G",
  98. tree->curr_site,
  99. catg,
  100. tree->site_lk_cat[catg],
  101. sum_scale_left_cat[catg]+sum_scale_rght_cat[catg],
  102. max_sum_scale,
  103. + min_sum_scale,
  104. fact_sum_scale,
  105. -(sum_scale_left_cat[catg]+sum_scale_rght_cat[catg])+fact_sum_scale,
  106. (double)tree->site_lk_cat[catg] * pow(2.,-(sum_scale_left_cat[catg]+sum_scale_rght_cat[catg])+fact_sum_scale));
  107. @@ -678,13 +693,11 @@
  108. fact_sum_scale,
  109. -(sum_scale_left_cat[catg]+sum_scale_rght_cat[catg])+fact_sum_scale,
  110. (double)tree->site_lk_cat[catg] * pow(2.,-(sum_scale_left_cat[catg]+sum_scale_rght_cat[catg])+fact_sum_scale));
  111. -
  112. +
  113. Exit("\n");
  114. }
  115. -
  116. site_lk_cat = .0;
  117. }
  118. -
  119. tree->site_lk_cat[catg] = site_lk_cat;
  120. }
  121. @@ -694,6 +707,24 @@
  122. site_lk += tree->site_lk_cat[catg] * tree->mod->gamma_r_proba->v[catg];
  123. }
  124. + if(isinf(site_lk))
  125. + {
  126. + PhyML_Printf("\n= Site = %d",site);
  127. + PhyML_Printf("\n= invar = %d",tree->data->invar[site]);
  128. + PhyML_Printf("\n= scale_left = %d scale_rght = %d",sum_scale_left,sum_scale_rght);
  129. + PhyML_Printf("\n= lk = %G log(lk) = %f < %G",site_lk,log_site_lk,-BIG);
  130. + PhyML_Printf("\n= fact_sum_scale = %d",fact_sum_scale);
  131. + For(catg,tree->mod->n_catg) PhyML_Printf("\n. rr=%f p=%f lk=%G expo=%d",
  132. + tree->mod->gamma_rr->v[catg],
  133. + tree->mod->gamma_r_proba->v[catg],
  134. + tree->site_lk_cat[catg],
  135. + -(sum_scale_left_cat[catg]+sum_scale_rght_cat[catg])+fact_sum_scale);
  136. + PhyML_Printf("\n= pinv = %G",tree->mod->pinvar->v);
  137. + PhyML_Printf("\n= bl mult = %G",tree->mod->br_len_multiplier->v);
  138. + PhyML_Printf("\n. Err in file %s at line %d",__FILE__,__LINE__);
  139. + Warn_And_Exit("\n");
  140. + }
  141. +
  142. inv_site_lk = 0.;
  143. @@ -741,19 +772,22 @@
  144. log_site_lk = LOG(site_lk) - (phydbl)LOG2 * fact_sum_scale;
  145. -
  146. For(catg,tree->mod->n_catg) tree->log_site_lk_cat[catg][site] = LOG(tree->site_lk_cat[catg]) - (phydbl)LOG2 * fact_sum_scale;
  147. if(isinf(log_site_lk) || isnan(log_site_lk))
  148. {
  149. - PhyML_Printf("\n. Site = %d",site);
  150. - PhyML_Printf("\n. invar = %d",tree->data->invar[site]);
  151. - PhyML_Printf("\n. scale_left = %d scale_rght = %d",sum_scale_left,sum_scale_rght);
  152. - PhyML_Printf("\n. inv_site_lk = %f",inv_site_lk);
  153. - PhyML_Printf("\n. Lk = %G LOG(Lk) = %f < %G",site_lk,log_site_lk,-BIG);
  154. - For(catg,tree->mod->n_catg) PhyML_Printf("\n. rr=%f p=%f",tree->mod->gamma_rr->v[catg],tree->mod->gamma_r_proba->v[catg]);
  155. - PhyML_Printf("\n. pinv = %G",tree->mod->pinvar->v);
  156. - PhyML_Printf("\n. bl mult = %G",tree->mod->br_len_multiplier->v);
  157. + PhyML_Printf("\n= Site = %d",site);
  158. + PhyML_Printf("\n= invar = %d",tree->data->invar[site]);
  159. + PhyML_Printf("\n= scale_left = %d scale_rght = %d",sum_scale_left,sum_scale_rght);
  160. + PhyML_Printf("\n= inv_site_lk = %f",inv_site_lk);
  161. + PhyML_Printf("\n= lk = %G log(lk) = %f < %G",site_lk,log_site_lk,-BIG);
  162. + For(catg,tree->mod->n_catg) PhyML_Printf("\n. rr=%f p=%f lk=%G",
  163. + tree->mod->gamma_rr->v[catg],
  164. + tree->mod->gamma_r_proba->v[catg],
  165. + tree->site_lk_cat[catg]);
  166. + PhyML_Printf("\n= pinv = %G",tree->mod->pinvar->v);
  167. + PhyML_Printf("\n= bl mult = %G",tree->mod->br_len_multiplier->v);
  168. + PhyML_Printf("\n= fact_sum_scale = %d",fact_sum_scale);
  169. /* int i; */
  170. /* For(i,2*tree->n_otu-3) */
  171. @@ -802,6 +836,7 @@
  172. Alias_One_Subpatt((d==b->left)?(b->rght):(b->left),d,tree);
  173. if(d->tax) return;
  174. +
  175. if(tree->mod->use_m4mod == NO)
  176. {
  177. @@ -813,6 +848,10 @@
  178. {
  179. Update_P_Lk_AA(tree,b,d);
  180. }
  181. + else
  182. + {
  183. + Update_P_Lk_Generic(tree,b,d);
  184. + }
  185. }
  186. else
  187. {
  188. @@ -1044,7 +1083,7 @@
  189. p_lk[site*NsNg+catg*Ns+i] = p1_lk1 * p2_lk2;
  190. - /* PhyML_Printf("\n+ %G",p_lk[site*NsNg+catg*Ns+i]); */
  191. + /* PhyML_Printf("\n+ %G",p_lk[site*NsNg+catg*Ns+i]); */
  192. if(p_lk[site*NsNg+catg*Ns+i] < smallest_p_lk) smallest_p_lk = p_lk[site*NsNg+catg*Ns+i] ;
  193. }
  194. unchanged:
  195. --- ./phyml-20120412/src/Makefile 1970-01-01 12:00:00.000000000 +1200
  196. +++ ./phyml-20120412-new-bak/src/Makefile 2013-02-18 21:54:46.957806553 +1300
  197. @@ -0,0 +1,1082 @@
  198. +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  199. +# src/Makefile. Generated from Makefile.in by configure.
  200. +
  201. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
  202. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
  203. +# Inc.
  204. +# This Makefile.in is free software; the Free Software Foundation
  205. +# gives unlimited permission to copy and/or distribute it,
  206. +# with or without modifications, as long as this notice is preserved.
  207. +
  208. +# This program is distributed in the hope that it will be useful,
  209. +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
  210. +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  211. +# PARTICULAR PURPOSE.
  212. +
  213. +
  214. +
  215. +
  216. +pkgdatadir = $(datadir)/phyml
  217. +pkgincludedir = $(includedir)/phyml
  218. +pkglibdir = $(libdir)/phyml
  219. +pkglibexecdir = $(libexecdir)/phyml
  220. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  221. +install_sh_DATA = $(install_sh) -c -m 644
  222. +install_sh_PROGRAM = $(install_sh) -c
  223. +install_sh_SCRIPT = $(install_sh) -c
  224. +INSTALL_HEADER = $(INSTALL_DATA)
  225. +transform = $(program_transform_name)
  226. +NORMAL_INSTALL = :
  227. +PRE_INSTALL = :
  228. +POST_INSTALL = :
  229. +NORMAL_UNINSTALL = :
  230. +PRE_UNINSTALL = :
  231. +POST_UNINSTALL = :
  232. +build_triplet = x86_64-unknown-linux-gnu
  233. +host_triplet = x86_64-unknown-linux-gnu
  234. +bin_PROGRAMS = phyml$(EXEEXT)
  235. +#bin_PROGRAMS = test$(EXEEXT)
  236. +#bin_PROGRAMS = phyml-mpi$(EXEEXT)
  237. +#bin_PROGRAMS = rf$(EXEEXT)
  238. +#bin_PROGRAMS = m4$(EXEEXT)
  239. +#bin_PROGRAMS = tiporder$(EXEEXT)
  240. +#bin_PROGRAMS = part$(EXEEXT)
  241. +#bin_PROGRAMS = \
  242. +# phycont$(EXEEXT)
  243. +#bin_PROGRAMS = phytime$(EXEEXT)
  244. +subdir = src
  245. +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  246. +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  247. +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
  248. +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  249. + $(ACLOCAL_M4)
  250. +mkinstalldirs = $(install_sh) -d
  251. +CONFIG_HEADER = $(top_builddir)/config.h
  252. +CONFIG_CLEAN_FILES =
  253. +CONFIG_CLEAN_VPATH_FILES =
  254. +am__installdirs = "$(DESTDIR)$(bindir)"
  255. +PROGRAMS = $(bin_PROGRAMS)
  256. +am__m4_SOURCES_DIST = main.c utilities.c utilities.h optimiz.c \
  257. + optimiz.h lk.c lk.h bionj.c bionj.h models.c models.h free.c \
  258. + free.h help.c help.h simu.c simu.h eigen.c eigen.h pars.c \
  259. + pars.h alrt.c alrt.h interface.c interface.h cl.c cl.h mg.c \
  260. + mg.h times.c times.h mcmc.c mcmc.h rates.c rates.h spr.c spr.h \
  261. + draw.c draw.h stats.c stats.h tiporder.c tiporder.h m4.c m4.h
  262. +#am_m4_OBJECTS = main.$(OBJEXT) \
  263. +# utilities.$(OBJEXT) \
  264. +# optimiz.$(OBJEXT) \
  265. +# lk.$(OBJEXT) \
  266. +# bionj.$(OBJEXT) \
  267. +# models.$(OBJEXT) \
  268. +# free.$(OBJEXT) \
  269. +# help.$(OBJEXT) \
  270. +# simu.$(OBJEXT) \
  271. +# eigen.$(OBJEXT) \
  272. +# pars.$(OBJEXT) \
  273. +# alrt.$(OBJEXT) \
  274. +# interface.$(OBJEXT) \
  275. +# cl.$(OBJEXT) \
  276. +# mg.$(OBJEXT) \
  277. +# times.$(OBJEXT) \
  278. +# mcmc.$(OBJEXT) \
  279. +# rates.$(OBJEXT) \
  280. +# spr.$(OBJEXT) \
  281. +# draw.$(OBJEXT) \
  282. +# stats.$(OBJEXT) \
  283. +# tiporder.$(OBJEXT) \
  284. +# m4.$(OBJEXT)
  285. +m4_OBJECTS = $(am_m4_OBJECTS)
  286. +m4_DEPENDENCIES =
  287. +am__part_SOURCES_DIST = main.c utilities.c utilities.h optimiz.c \
  288. + optimiz.h lk.c lk.h bionj.c bionj.h models.c models.h free.c \
  289. + free.h help.c help.h simu.c simu.h eigen.c eigen.h pars.c \
  290. + pars.h alrt.c alrt.h interface.c interface.h cl.c cl.h mg.c \
  291. + mg.h spr.c spr.h m4.c m4.h draw.c draw.h stats.c stats.h \
  292. + tiporder.c tiporder.h
  293. +#am_part_OBJECTS = main.$(OBJEXT) \
  294. +# utilities.$(OBJEXT) \
  295. +# optimiz.$(OBJEXT) \
  296. +# lk.$(OBJEXT) \
  297. +# bionj.$(OBJEXT) \
  298. +# models.$(OBJEXT) \
  299. +# free.$(OBJEXT) \
  300. +# help.$(OBJEXT) \
  301. +# simu.$(OBJEXT) \
  302. +# eigen.$(OBJEXT) \
  303. +# pars.$(OBJEXT) \
  304. +# alrt.$(OBJEXT) \
  305. +# interface.$(OBJEXT) \
  306. +# cl.$(OBJEXT) \
  307. +# mg.$(OBJEXT) \
  308. +# spr.$(OBJEXT) \
  309. +# m4.$(OBJEXT) \
  310. +# draw.$(OBJEXT) \
  311. +# stats.$(OBJEXT) \
  312. +# tiporder.$(OBJEXT)
  313. +part_OBJECTS = $(am_part_OBJECTS)
  314. +part_DEPENDENCIES =
  315. +am__phycont_SOURCES_DIST = main.c utilities.c utilities.h optimiz.c \
  316. + optimiz.h lk.c lk.h bionj.c bionj.h models.c models.h free.c \
  317. + free.h help.c help.h simu.c simu.h eigen.c eigen.h pars.c \
  318. + pars.h alrt.c alrt.h interface.c interface.h cl.c cl.h spr.c \
  319. + spr.h times.c times.h m4.c m4.h draw.c draw.h rates.c rates.h \
  320. + mcmc.c mcmc.h stats.c stats.h mg.c mg.h tiporder.c tiporder.h
  321. +#am_phycont_OBJECTS = \
  322. +# main.$(OBJEXT) \
  323. +# utilities.$(OBJEXT) \
  324. +# optimiz.$(OBJEXT) \
  325. +# lk.$(OBJEXT) \
  326. +# bionj.$(OBJEXT) \
  327. +# models.$(OBJEXT) \
  328. +# free.$(OBJEXT) \
  329. +# help.$(OBJEXT) \
  330. +# simu.$(OBJEXT) \
  331. +# eigen.$(OBJEXT) \
  332. +# pars.$(OBJEXT) \
  333. +# alrt.$(OBJEXT) \
  334. +# interface.$(OBJEXT) \
  335. +# cl.$(OBJEXT) \
  336. +# spr.$(OBJEXT) \
  337. +# times.$(OBJEXT) \
  338. +# m4.$(OBJEXT) \
  339. +# draw.$(OBJEXT) \
  340. +# rates.$(OBJEXT) \
  341. +# mcmc.$(OBJEXT) \
  342. +# stats.$(OBJEXT) \
  343. +# mg.$(OBJEXT) \
  344. +# tiporder.$(OBJEXT)
  345. +phycont_OBJECTS = $(am_phycont_OBJECTS)
  346. +phycont_DEPENDENCIES =
  347. +am__phyml_SOURCES_DIST = main.c utilities.c utilities.h optimiz.c \
  348. + optimiz.h lk.c lk.h bionj.c bionj.h models.c models.h free.c \
  349. + free.h help.c help.h simu.c simu.h eigen.c eigen.h pars.c \
  350. + pars.h alrt.c alrt.h interface.c interface.h cl.c cl.h spr.c \
  351. + spr.h draw.c draw.h stats.c stats.h rates.c rates.h mcmc.c \
  352. + mcmc.h times.c times.h tiporder.c tiporder.h mg.c mg.h m4.c \
  353. + m4.h
  354. +am_phyml_OBJECTS = main.$(OBJEXT) \
  355. + utilities.$(OBJEXT) \
  356. + optimiz.$(OBJEXT) \
  357. + lk.$(OBJEXT) \
  358. + bionj.$(OBJEXT) \
  359. + models.$(OBJEXT) \
  360. + free.$(OBJEXT) \
  361. + help.$(OBJEXT) \
  362. + simu.$(OBJEXT) \
  363. + eigen.$(OBJEXT) \
  364. + pars.$(OBJEXT) \
  365. + alrt.$(OBJEXT) \
  366. + interface.$(OBJEXT) \
  367. + cl.$(OBJEXT) \
  368. + spr.$(OBJEXT) \
  369. + draw.$(OBJEXT) \
  370. + stats.$(OBJEXT) \
  371. + rates.$(OBJEXT) \
  372. + mcmc.$(OBJEXT) \
  373. + times.$(OBJEXT) \
  374. + tiporder.$(OBJEXT) \
  375. + mg.$(OBJEXT) \
  376. + m4.$(OBJEXT)
  377. +phyml_OBJECTS = $(am_phyml_OBJECTS)
  378. +phyml_DEPENDENCIES =
  379. +am__phyml_mpi_SOURCES_DIST = main.c utilities.c utilities.h optimiz.c \
  380. + optimiz.h lk.c lk.h bionj.c bionj.h models.c models.h free.c \
  381. + free.h help.c help.h simu.c simu.h eigen.c eigen.h pars.c \
  382. + pars.h alrt.c alrt.h interface.c interface.h cl.c cl.h spr.c \
  383. + spr.h draw.c draw.h mpi_boot.c mpi_boot.h stats.c stats.h \
  384. + rates.c rates.h mcmc.c mcmc.h times.c times.h tiporder.c \
  385. + tiporder.h mg.c mg.h m4.c m4.h xml.c xml.h
  386. +#am_phyml_mpi_OBJECTS = main.$(OBJEXT) \
  387. +# utilities.$(OBJEXT) \
  388. +# optimiz.$(OBJEXT) \
  389. +# lk.$(OBJEXT) \
  390. +# bionj.$(OBJEXT) \
  391. +# models.$(OBJEXT) \
  392. +# free.$(OBJEXT) \
  393. +# help.$(OBJEXT) \
  394. +# simu.$(OBJEXT) \
  395. +# eigen.$(OBJEXT) \
  396. +# pars.$(OBJEXT) \
  397. +# alrt.$(OBJEXT) \
  398. +# interface.$(OBJEXT) \
  399. +# cl.$(OBJEXT) \
  400. +# spr.$(OBJEXT) \
  401. +# draw.$(OBJEXT) \
  402. +# mpi_boot.$(OBJEXT) \
  403. +# stats.$(OBJEXT) \
  404. +# rates.$(OBJEXT) \
  405. +# mcmc.$(OBJEXT) \
  406. +# times.$(OBJEXT) \
  407. +# tiporder.$(OBJEXT) \
  408. +# mg.$(OBJEXT) \
  409. +# m4.$(OBJEXT) \
  410. +# xml.$(OBJEXT)
  411. +phyml_mpi_OBJECTS = $(am_phyml_mpi_OBJECTS)
  412. +phyml_mpi_DEPENDENCIES =
  413. +am__phytime_SOURCES_DIST = main.c utilities.c utilities.h optimiz.c \
  414. + optimiz.h lk.c lk.h bionj.c bionj.h models.c models.h free.c \
  415. + free.h help.c help.h simu.c simu.h eigen.c eigen.h pars.c \
  416. + pars.h alrt.c alrt.h interface.c interface.h cl.c cl.h spr.c \
  417. + spr.h times.c times.h m4.c m4.h draw.c draw.h rates.c rates.h \
  418. + mcmc.c mcmc.h stats.c stats.h mg.c mg.h tiporder.c tiporder.h
  419. +#am_phytime_OBJECTS = main.$(OBJEXT) \
  420. +# utilities.$(OBJEXT) optimiz.$(OBJEXT) \
  421. +# lk.$(OBJEXT) bionj.$(OBJEXT) \
  422. +# models.$(OBJEXT) free.$(OBJEXT) \
  423. +# help.$(OBJEXT) simu.$(OBJEXT) \
  424. +# eigen.$(OBJEXT) pars.$(OBJEXT) \
  425. +# alrt.$(OBJEXT) interface.$(OBJEXT) \
  426. +# cl.$(OBJEXT) spr.$(OBJEXT) times.$(OBJEXT) \
  427. +# m4.$(OBJEXT) draw.$(OBJEXT) rates.$(OBJEXT) \
  428. +# mcmc.$(OBJEXT) stats.$(OBJEXT) mg.$(OBJEXT) \
  429. +# tiporder.$(OBJEXT)
  430. +phytime_OBJECTS = $(am_phytime_OBJECTS)
  431. +phytime_DEPENDENCIES =
  432. +am__rf_SOURCES_DIST = main.c utilities.c utilities.h optimiz.c \
  433. + optimiz.h lk.c lk.h bionj.c bionj.h models.c models.h free.c \
  434. + free.h help.c help.h simu.c simu.h eigen.c eigen.h pars.c \
  435. + pars.h alrt.c alrt.h interface.c interface.h cl.c cl.h mg.c \
  436. + mg.h times.c times.h mcmc.c mcmc.h rates.c rates.h spr.c spr.h \
  437. + draw.c draw.h stats.c stats.h tiporder.c tiporder.h m4.c m4.h
  438. +#am_rf_OBJECTS = main.$(OBJEXT) \
  439. +# utilities.$(OBJEXT) \
  440. +# optimiz.$(OBJEXT) \
  441. +# lk.$(OBJEXT) \
  442. +# bionj.$(OBJEXT) \
  443. +# models.$(OBJEXT) \
  444. +# free.$(OBJEXT) \
  445. +# help.$(OBJEXT) \
  446. +# simu.$(OBJEXT) \
  447. +# eigen.$(OBJEXT) \
  448. +# pars.$(OBJEXT) \
  449. +# alrt.$(OBJEXT) \
  450. +# interface.$(OBJEXT) \
  451. +# cl.$(OBJEXT) \
  452. +# mg.$(OBJEXT) \
  453. +# times.$(OBJEXT) \
  454. +# mcmc.$(OBJEXT) \
  455. +# rates.$(OBJEXT) \
  456. +# spr.$(OBJEXT) \
  457. +# draw.$(OBJEXT) \
  458. +# stats.$(OBJEXT) \
  459. +# tiporder.$(OBJEXT) \
  460. +# m4.$(OBJEXT)
  461. +rf_OBJECTS = $(am_rf_OBJECTS)
  462. +rf_DEPENDENCIES =
  463. +am__test_SOURCES_DIST = main.c utilities.c utilities.h optimiz.c \
  464. + optimiz.h lk.c lk.h bionj.c bionj.h models.c models.h free.c \
  465. + free.h help.c help.h simu.c simu.h eigen.c eigen.h pars.c \
  466. + pars.h alrt.c alrt.h interface.c interface.h cl.c cl.h spr.c \
  467. + spr.h draw.c draw.h stats.c stats.h rates.c rates.h mcmc.c \
  468. + mcmc.h times.c times.h tiporder.c tiporder.h mg.c mg.h m4.c \
  469. + m4.h xml.c xml.h
  470. +#am_test_OBJECTS = main.$(OBJEXT) \
  471. +# utilities.$(OBJEXT) \
  472. +# optimiz.$(OBJEXT) \
  473. +# lk.$(OBJEXT) \
  474. +# bionj.$(OBJEXT) \
  475. +# models.$(OBJEXT) \
  476. +# free.$(OBJEXT) \
  477. +# help.$(OBJEXT) \
  478. +# simu.$(OBJEXT) \
  479. +# eigen.$(OBJEXT) \
  480. +# pars.$(OBJEXT) \
  481. +# alrt.$(OBJEXT) \
  482. +# interface.$(OBJEXT) \
  483. +# cl.$(OBJEXT) \
  484. +# spr.$(OBJEXT) \
  485. +# draw.$(OBJEXT) \
  486. +# stats.$(OBJEXT) \
  487. +# rates.$(OBJEXT) \
  488. +# mcmc.$(OBJEXT) \
  489. +# times.$(OBJEXT) \
  490. +# tiporder.$(OBJEXT) \
  491. +# mg.$(OBJEXT) \
  492. +# m4.$(OBJEXT) \
  493. +# xml.$(OBJEXT)
  494. +test_OBJECTS = $(am_test_OBJECTS)
  495. +test_DEPENDENCIES =
  496. +am__tiporder_SOURCES_DIST = main.c utilities.c utilities.h optimiz.c \
  497. + optimiz.h lk.c lk.h bionj.c bionj.h models.c models.h free.c \
  498. + free.h help.c help.h simu.c simu.h eigen.c eigen.h pars.c \
  499. + pars.h alrt.c alrt.h interface.c interface.h cl.c cl.h mg.c \
  500. + mg.h times.c times.h mcmc.c mcmc.h rates.c rates.h spr.c spr.h \
  501. + m4.c m4.h draw.c draw.h stats.c stats.h tiporder.c tiporder.h
  502. +#am_tiporder_OBJECTS = main.$(OBJEXT) \
  503. +# utilities.$(OBJEXT) \
  504. +# optimiz.$(OBJEXT) \
  505. +# lk.$(OBJEXT) \
  506. +# bionj.$(OBJEXT) \
  507. +# models.$(OBJEXT) \
  508. +# free.$(OBJEXT) \
  509. +# help.$(OBJEXT) \
  510. +# simu.$(OBJEXT) \
  511. +# eigen.$(OBJEXT) \
  512. +# pars.$(OBJEXT) \
  513. +# alrt.$(OBJEXT) \
  514. +# interface.$(OBJEXT) \
  515. +# cl.$(OBJEXT) \
  516. +# mg.$(OBJEXT) \
  517. +# times.$(OBJEXT) \
  518. +# mcmc.$(OBJEXT) \
  519. +# rates.$(OBJEXT) \
  520. +# spr.$(OBJEXT) \
  521. +# m4.$(OBJEXT) \
  522. +# draw.$(OBJEXT) \
  523. +# stats.$(OBJEXT) \
  524. +# tiporder.$(OBJEXT)
  525. +tiporder_OBJECTS = $(am_tiporder_OBJECTS)
  526. +tiporder_DEPENDENCIES =
  527. +DEFAULT_INCLUDES = -I. -I$(top_builddir)
  528. +depcomp = $(SHELL) $(top_srcdir)/depcomp
  529. +am__depfiles_maybe = depfiles
  530. +am__mv = mv -f
  531. +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  532. + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  533. +AM_V_CC = $(am__v_CC_$(V))
  534. +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
  535. +am__v_CC_0 = @echo " CC " $@;
  536. +AM_V_at = $(am__v_at_$(V))
  537. +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
  538. +am__v_at_0 = @
  539. +CCLD = $(CC)
  540. +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  541. +AM_V_CCLD = $(am__v_CCLD_$(V))
  542. +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
  543. +am__v_CCLD_0 = @echo " CCLD " $@;
  544. +AM_V_GEN = $(am__v_GEN_$(V))
  545. +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
  546. +am__v_GEN_0 = @echo " GEN " $@;
  547. +SOURCES = $(m4_SOURCES) $(part_SOURCES) $(phycont_SOURCES) \
  548. + $(phyml_SOURCES) $(phyml_mpi_SOURCES) $(phytime_SOURCES) \
  549. + $(rf_SOURCES) $(test_SOURCES) $(tiporder_SOURCES)
  550. +DIST_SOURCES = $(am__m4_SOURCES_DIST) $(am__part_SOURCES_DIST) \
  551. + $(am__phycont_SOURCES_DIST) $(am__phyml_SOURCES_DIST) \
  552. + $(am__phyml_mpi_SOURCES_DIST) $(am__phytime_SOURCES_DIST) \
  553. + $(am__rf_SOURCES_DIST) $(am__test_SOURCES_DIST) \
  554. + $(am__tiporder_SOURCES_DIST)
  555. +ETAGS = etags
  556. +CTAGS = ctags
  557. +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  558. +ACLOCAL = ${SHELL} /home/guindon/Downloads/phyml-20120412/missing --run aclocal-1.11
  559. +AMTAR = ${SHELL} /home/guindon/Downloads/phyml-20120412/missing --run tar
  560. +AM_DEFAULT_VERBOSITY = 1
  561. +AUTOCONF = ${SHELL} /home/guindon/Downloads/phyml-20120412/missing --run autoconf
  562. +AUTOHEADER = ${SHELL} /home/guindon/Downloads/phyml-20120412/missing --run autoheader
  563. +AUTOMAKE = ${SHELL} /home/guindon/Downloads/phyml-20120412/missing --run automake-1.11
  564. +AWK = gawk
  565. +CC = gcc
  566. +CCDEPMODE = depmode=gcc3
  567. +CFLAGS = -ansi -pedantic -Wall -std=c99 -O0 -g
  568. +CPP = gcc -E
  569. +CPPFLAGS =
  570. +CYGPATH_W = echo
  571. +DEFS = $(REVISION)
  572. +DEPDIR = .deps
  573. +ECHO_C =
  574. +ECHO_N = -n
  575. +ECHO_T =
  576. +EGREP = /usr/bin/grep -E
  577. +EXEEXT =
  578. +GREP = /usr/bin/grep
  579. +INSTALL = /usr/bin/install -c
  580. +INSTALL_DATA = ${INSTALL} -m 644
  581. +INSTALL_PROGRAM = ${INSTALL}
  582. +INSTALL_SCRIPT = ${INSTALL}
  583. +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
  584. +LDFLAGS =
  585. +LIBOBJS =
  586. +LIBS = -lm
  587. +LTLIBOBJS =
  588. +MAKEINFO = ${SHELL} /home/guindon/Downloads/phyml-20120412/missing --run makeinfo
  589. +MKDIR_P = /usr/bin/mkdir -p
  590. +OBJEXT = o
  591. +PACKAGE = phyml
  592. +PACKAGE_BUGREPORT = s.guindon@auckland.ac.nz
  593. +PACKAGE_NAME = PhyML
  594. +PACKAGE_STRING = PhyML 20120412
  595. +PACKAGE_TARNAME = phyml
  596. +PACKAGE_URL =
  597. +PACKAGE_VERSION = 20120412
  598. +PATH_SEPARATOR = :
  599. +SET_MAKE =
  600. +SHELL = /bin/sh
  601. +STRIP =
  602. +VERSION = 20120412
  603. +abs_builddir = /home/guindon/Downloads/phyml-20120412/src
  604. +abs_srcdir = /home/guindon/Downloads/phyml-20120412/src
  605. +abs_top_builddir = /home/guindon/Downloads/phyml-20120412
  606. +abs_top_srcdir = /home/guindon/Downloads/phyml-20120412
  607. +ac_ct_CC = gcc
  608. +am__include = include
  609. +am__leading_dot = .
  610. +am__quote =
  611. +am__tar = ${AMTAR} chof - "$$tardir"
  612. +am__untar = ${AMTAR} xf -
  613. +bindir = ${exec_prefix}/bin
  614. +build = x86_64-unknown-linux-gnu
  615. +build_alias =
  616. +build_cpu = x86_64
  617. +build_os = linux-gnu
  618. +build_vendor = unknown
  619. +builddir = .
  620. +datadir = ${datarootdir}
  621. +datarootdir = ${prefix}/share
  622. +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
  623. +dvidir = ${docdir}
  624. +exec_prefix = ${prefix}
  625. +host = x86_64-unknown-linux-gnu
  626. +host_alias =
  627. +host_cpu = x86_64
  628. +host_os = linux-gnu
  629. +host_vendor = unknown
  630. +htmldir = ${docdir}
  631. +includedir = ${prefix}/include
  632. +infodir = ${datarootdir}/info
  633. +install_sh = ${SHELL} /home/guindon/Downloads/phyml-20120412/install-sh
  634. +libdir = ${exec_prefix}/lib
  635. +libexecdir = ${exec_prefix}/libexec
  636. +localedir = ${datarootdir}/locale
  637. +localstatedir = ${prefix}/var
  638. +mandir = ${datarootdir}/man
  639. +mkdir_p = /usr/bin/mkdir -p
  640. +oldincludedir = /usr/include
  641. +pdfdir = ${docdir}
  642. +prefix = /usr/local
  643. +program_transform_name = s,x,x,
  644. +psdir = ${docdir}
  645. +sbindir = ${exec_prefix}/sbin
  646. +sharedstatedir = ${prefix}/com
  647. +srcdir = .
  648. +sysconfdir = ${prefix}/etc
  649. +target_alias =
  650. +top_build_prefix = ../
  651. +top_builddir = ..
  652. +top_srcdir = ..
  653. +PROG = PHYML
  654. +#PROG = TEST
  655. +#PROG = PHYML
  656. +#PROG = RF
  657. +#PROG = M4
  658. +#PROG = TIPORDER
  659. +#PROG = RWRAP
  660. +#PROG = PART
  661. +#PROG = PHYCONT
  662. +#PROG = PHYTIME
  663. +#phytime_SOURCES = main.c \
  664. +#utilities.c utilities.h\
  665. +#optimiz.c optimiz.h\
  666. +#lk.c lk.h\
  667. +#bionj.c bionj.h\
  668. +#models.c models.h\
  669. +#free.c free.h\
  670. +#help.c help.h\
  671. +#simu.c simu.h\
  672. +#eigen.c eigen.h\
  673. +#pars.c pars.h\
  674. +#alrt.c alrt.h\
  675. +#interface.c interface.h\
  676. +#cl.c cl.h\
  677. +#spr.c spr.h\
  678. +#times.c times.h\
  679. +#m4.c m4.h\
  680. +#draw.c draw.h\
  681. +#rates.c rates.h\
  682. +#mcmc.c mcmc.h\
  683. +#stats.c stats.h\
  684. +#mg.c mg.h\
  685. +#tiporder.c tiporder.h
  686. +
  687. +#phytime_LDADD = -lm
  688. +#phycont_SOURCES = main.c \
  689. +#utilities.c utilities.h\
  690. +#optimiz.c optimiz.h\
  691. +#lk.c lk.h\
  692. +#bionj.c bionj.h\
  693. +#models.c models.h\
  694. +#free.c free.h\
  695. +#help.c help.h\
  696. +#simu.c simu.h\
  697. +#eigen.c eigen.h\
  698. +#pars.c pars.h\
  699. +#alrt.c alrt.h\
  700. +#interface.c interface.h\
  701. +#cl.c cl.h\
  702. +#spr.c spr.h\
  703. +#times.c times.h\
  704. +#m4.c m4.h\
  705. +#draw.c draw.h\
  706. +#rates.c rates.h\
  707. +#mcmc.c mcmc.h\
  708. +#stats.c stats.h\
  709. +#mg.c mg.h\
  710. +#tiporder.c tiporder.h
  711. +
  712. +# continuous.c continuous.h
  713. +#phycont_LDADD = -lm
  714. +# if WANT_RWRAP
  715. +# lib_LTLIBRARIES = librwrap.la
  716. +# librwrap_la_SOURCES = main.c \
  717. +# utilities.c utilities.h\
  718. +# optimiz.c optimiz.h\
  719. +# lk.c lk.h\
  720. +# bionj.c bionj.h\
  721. +# models.c models.h\
  722. +# free.c free.h\
  723. +# help.c help.h\
  724. +# simu.c simu.h\
  725. +# eigen.c eigen.h\
  726. +# pars.c pars.h\
  727. +# alrt.c alrt.h\
  728. +# interface.c interface.h\
  729. +# cl.c cl.h\
  730. +# mg.c mg.h\
  731. +# spr.c spr.h\
  732. +# m4.c m4.h\
  733. +# draw.c draw.h\
  734. +# mcmc.c mcmc.h\
  735. +# stats.c stats.h\
  736. +# times.c times.h\
  737. +# tiporder.c tiporder.h\
  738. +# rates.c rates.h\
  739. +# rwrapper.c rwrapper.h
  740. +# librwrap_la_LIBADD = -lm
  741. +# librwrap_la_LDFLAGS = -I/Library/Frameworks/R.framework/Resources/include -I/Library/Frameworks/R.framework/Resources/include/i386 -I/usr/local/include -flat_namespace -undefined suppress -shared -module
  742. +# librwrap_la_CFLAGS=-std=gnu99 -fPIC
  743. +# else
  744. +#part_SOURCES = main.c \
  745. +#utilities.c utilities.h\
  746. +#optimiz.c optimiz.h\
  747. +#lk.c lk.h\
  748. +#bionj.c bionj.h\
  749. +#models.c models.h\
  750. +#free.c free.h\
  751. +#help.c help.h\
  752. +#simu.c simu.h\
  753. +#eigen.c eigen.h\
  754. +#pars.c pars.h\
  755. +#alrt.c alrt.h\
  756. +#interface.c interface.h\
  757. +#cl.c cl.h\
  758. +#mg.c mg.h\
  759. +#spr.c spr.h\
  760. +#m4.c m4.h\
  761. +#draw.c draw.h\
  762. +#stats.c stats.h\
  763. +#tiporder.c tiporder.h
  764. +
  765. +#part_LDADD = -lm
  766. +#tiporder_SOURCES = main.c \
  767. +#utilities.c utilities.h\
  768. +#optimiz.c optimiz.h\
  769. +#lk.c lk.h\
  770. +#bionj.c bionj.h\
  771. +#models.c models.h\
  772. +#free.c free.h\
  773. +#help.c help.h\
  774. +#simu.c simu.h\
  775. +#eigen.c eigen.h\
  776. +#pars.c pars.h\
  777. +#alrt.c alrt.h\
  778. +#interface.c interface.h\
  779. +#cl.c cl.h\
  780. +#mg.c mg.h\
  781. +#times.c times.h\
  782. +#mcmc.c mcmc.h\
  783. +#rates.c rates.h\
  784. +#spr.c spr.h\
  785. +#m4.c m4.h\
  786. +#draw.c draw.h\
  787. +#stats.c stats.h\
  788. +#tiporder.c tiporder.h
  789. +
  790. +#tiporder_LDADD = -lm
  791. +#m4_SOURCES = main.c \
  792. +#utilities.c utilities.h\
  793. +#optimiz.c optimiz.h\
  794. +#lk.c lk.h\
  795. +#bionj.c bionj.h\
  796. +#models.c models.h\
  797. +#free.c free.h\
  798. +#help.c help.h\
  799. +#simu.c simu.h\
  800. +#eigen.c eigen.h\
  801. +#pars.c pars.h\
  802. +#alrt.c alrt.h\
  803. +#interface.c interface.h\
  804. +#cl.c cl.h\
  805. +#mg.c mg.h\
  806. +#times.c times.h\
  807. +#mcmc.c mcmc.h\
  808. +#rates.c rates.h\
  809. +#spr.c spr.h\
  810. +#draw.c draw.h\
  811. +#stats.c stats.h\
  812. +#tiporder.c tiporder.h\
  813. +#m4.c m4.h
  814. +
  815. +#m4_LDADD = -lm
  816. +#rf_SOURCES = main.c \
  817. +#utilities.c utilities.h\
  818. +#optimiz.c optimiz.h\
  819. +#lk.c lk.h\
  820. +#bionj.c bionj.h\
  821. +#models.c models.h\
  822. +#free.c free.h\
  823. +#help.c help.h\
  824. +#simu.c simu.h\
  825. +#eigen.c eigen.h\
  826. +#pars.c pars.h\
  827. +#alrt.c alrt.h\
  828. +#interface.c interface.h\
  829. +#cl.c cl.h\
  830. +#mg.c mg.h\
  831. +#times.c times.h\
  832. +#mcmc.c mcmc.h\
  833. +#rates.c rates.h\
  834. +#spr.c spr.h\
  835. +#draw.c draw.h\
  836. +#stats.c stats.h\
  837. +#tiporder.c tiporder.h\
  838. +#m4.c m4.h
  839. +
  840. +#rf_LDADD = -lm
  841. +#phyml_mpi_SOURCES = main.c \
  842. +#utilities.c utilities.h\
  843. +#optimiz.c optimiz.h\
  844. +#lk.c lk.h\
  845. +#bionj.c bionj.h\
  846. +#models.c models.h\
  847. +#free.c free.h\
  848. +#help.c help.h\
  849. +#simu.c simu.h\
  850. +#eigen.c eigen.h\
  851. +#pars.c pars.h\
  852. +#alrt.c alrt.h\
  853. +#interface.c interface.h\
  854. +#cl.c cl.h\
  855. +#spr.c spr.h\
  856. +#draw.c draw.h\
  857. +#mpi_boot.c mpi_boot.h\
  858. +#stats.c stats.h\
  859. +#rates.c rates.h\
  860. +#mcmc.c mcmc.h\
  861. +#times.c times.h\
  862. +#tiporder.c tiporder.h\
  863. +#mg.c mg.h\
  864. +#m4.c m4.h\
  865. +#xml.c xml.h
  866. +
  867. +#phyml_mpi_LDADD = -lm
  868. +#test_SOURCES = main.c \
  869. +#utilities.c utilities.h\
  870. +#optimiz.c optimiz.h\
  871. +#lk.c lk.h\
  872. +#bionj.c bionj.h\
  873. +#models.c models.h\
  874. +#free.c free.h\
  875. +#help.c help.h\
  876. +#simu.c simu.h\
  877. +#eigen.c eigen.h\
  878. +#pars.c pars.h\
  879. +#alrt.c alrt.h\
  880. +#interface.c interface.h\
  881. +#cl.c cl.h\
  882. +#spr.c spr.h\
  883. +#draw.c draw.h\
  884. +#stats.c stats.h\
  885. +#rates.c rates.h\
  886. +#mcmc.c mcmc.h\
  887. +#times.c times.h\
  888. +#tiporder.c tiporder.h\
  889. +#mg.c mg.h\
  890. +#m4.c m4.h\
  891. +#xml.c xml.h
  892. +
  893. +#test_LDADD = -lm
  894. +phyml_SOURCES = main.c \
  895. +utilities.c utilities.h\
  896. +optimiz.c optimiz.h\
  897. +lk.c lk.h\
  898. +bionj.c bionj.h\
  899. +models.c models.h\
  900. +free.c free.h\
  901. +help.c help.h\
  902. +simu.c simu.h\
  903. +eigen.c eigen.h\
  904. +pars.c pars.h\
  905. +alrt.c alrt.h\
  906. +interface.c interface.h\
  907. +cl.c cl.h\
  908. +spr.c spr.h\
  909. +draw.c draw.h\
  910. +stats.c stats.h\
  911. +rates.c rates.h\
  912. +mcmc.c mcmc.h\
  913. +times.c times.h\
  914. +tiporder.c tiporder.h\
  915. +mg.c mg.h\
  916. +m4.c m4.h
  917. +
  918. +phyml_LDADD = -lm
  919. +all: all-am
  920. +
  921. +.SUFFIXES:
  922. +.SUFFIXES: .c .o .obj
  923. +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
  924. + @for dep in $?; do \
  925. + case '$(am__configure_deps)' in \
  926. + *$$dep*) \
  927. + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
  928. + && { if test -f $@; then exit 0; else break; fi; }; \
  929. + exit 1;; \
  930. + esac; \
  931. + done; \
  932. + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
  933. + $(am__cd) $(top_srcdir) && \
  934. + $(AUTOMAKE) --foreign src/Makefile
  935. +.PRECIOUS: Makefile
  936. +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  937. + @case '$?' in \
  938. + *config.status*) \
  939. + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
  940. + *) \
  941. + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
  942. + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
  943. + esac;
  944. +
  945. +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  946. + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  947. +
  948. +$(top_srcdir)/configure: $(am__configure_deps)
  949. + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  950. +$(ACLOCAL_M4): $(am__aclocal_m4_deps)
  951. + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  952. +$(am__aclocal_m4_deps):
  953. +install-binPROGRAMS: $(bin_PROGRAMS)
  954. + @$(NORMAL_INSTALL)
  955. + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
  956. + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
  957. + for p in $$list; do echo "$$p $$p"; done | \
  958. + sed 's/$(EXEEXT)$$//' | \
  959. + while read p p1; do if test -f $$p; \
  960. + then echo "$$p"; echo "$$p"; else :; fi; \
  961. + done | \
  962. + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
  963. + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
  964. + sed 'N;N;N;s,\n, ,g' | \
  965. + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
  966. + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
  967. + if ($$2 == $$4) files[d] = files[d] " " $$1; \
  968. + else { print "f", $$3 "/" $$4, $$1; } } \
  969. + END { for (d in files) print "f", d, files[d] }' | \
  970. + while read type dir files; do \
  971. + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
  972. + test -z "$$files" || { \
  973. + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
  974. + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
  975. + } \
  976. + ; done
  977. +
  978. +uninstall-binPROGRAMS:
  979. + @$(NORMAL_UNINSTALL)
  980. + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
  981. + files=`for p in $$list; do echo "$$p"; done | \
  982. + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
  983. + -e 's/$$/$(EXEEXT)/' `; \
  984. + test -n "$$list" || exit 0; \
  985. + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
  986. + cd "$(DESTDIR)$(bindir)" && rm -f $$files
  987. +
  988. +clean-binPROGRAMS:
  989. + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
  990. +m4$(EXEEXT): $(m4_OBJECTS) $(m4_DEPENDENCIES)
  991. + @rm -f m4$(EXEEXT)
  992. + $(AM_V_CCLD)$(LINK) $(m4_OBJECTS) $(m4_LDADD) $(LIBS)
  993. +part$(EXEEXT): $(part_OBJECTS) $(part_DEPENDENCIES)
  994. + @rm -f part$(EXEEXT)
  995. + $(AM_V_CCLD)$(LINK) $(part_OBJECTS) $(part_LDADD) $(LIBS)
  996. +phycont$(EXEEXT): $(phycont_OBJECTS) $(phycont_DEPENDENCIES)
  997. + @rm -f phycont$(EXEEXT)
  998. + $(AM_V_CCLD)$(LINK) $(phycont_OBJECTS) $(phycont_LDADD) $(LIBS)
  999. +phyml$(EXEEXT): $(phyml_OBJECTS) $(phyml_DEPENDENCIES)
  1000. + @rm -f phyml$(EXEEXT)
  1001. + $(AM_V_CCLD)$(LINK) $(phyml_OBJECTS) $(phyml_LDADD) $(LIBS)
  1002. +phyml-mpi$(EXEEXT): $(phyml_mpi_OBJECTS) $(phyml_mpi_DEPENDENCIES)
  1003. + @rm -f phyml-mpi$(EXEEXT)
  1004. + $(AM_V_CCLD)$(LINK) $(phyml_mpi_OBJECTS) $(phyml_mpi_LDADD) $(LIBS)
  1005. +phytime$(EXEEXT): $(phytime_OBJECTS) $(phytime_DEPENDENCIES)
  1006. + @rm -f phytime$(EXEEXT)
  1007. + $(AM_V_CCLD)$(LINK) $(phytime_OBJECTS) $(phytime_LDADD) $(LIBS)
  1008. +rf$(EXEEXT): $(rf_OBJECTS) $(rf_DEPENDENCIES)
  1009. + @rm -f rf$(EXEEXT)
  1010. + $(AM_V_CCLD)$(LINK) $(rf_OBJECTS) $(rf_LDADD) $(LIBS)
  1011. +test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES)
  1012. + @rm -f test$(EXEEXT)
  1013. + $(AM_V_CCLD)$(LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
  1014. +tiporder$(EXEEXT): $(tiporder_OBJECTS) $(tiporder_DEPENDENCIES)
  1015. + @rm -f tiporder$(EXEEXT)
  1016. + $(AM_V_CCLD)$(LINK) $(tiporder_OBJECTS) $(tiporder_LDADD) $(LIBS)
  1017. +
  1018. +mostlyclean-compile:
  1019. + -rm -f *.$(OBJEXT)
  1020. +
  1021. +distclean-compile:
  1022. + -rm -f *.tab.c
  1023. +
  1024. +include ./$(DEPDIR)/alrt.Po
  1025. +include ./$(DEPDIR)/bionj.Po
  1026. +include ./$(DEPDIR)/cl.Po
  1027. +include ./$(DEPDIR)/draw.Po
  1028. +include ./$(DEPDIR)/eigen.Po
  1029. +include ./$(DEPDIR)/free.Po
  1030. +include ./$(DEPDIR)/help.Po
  1031. +include ./$(DEPDIR)/interface.Po
  1032. +include ./$(DEPDIR)/lk.Po
  1033. +include ./$(DEPDIR)/m4.Po
  1034. +include ./$(DEPDIR)/main.Po
  1035. +include ./$(DEPDIR)/mcmc.Po
  1036. +include ./$(DEPDIR)/mg.Po
  1037. +include ./$(DEPDIR)/models.Po
  1038. +include ./$(DEPDIR)/mpi_boot.Po
  1039. +include ./$(DEPDIR)/optimiz.Po
  1040. +include ./$(DEPDIR)/pars.Po
  1041. +include ./$(DEPDIR)/rates.Po
  1042. +include ./$(DEPDIR)/simu.Po
  1043. +include ./$(DEPDIR)/spr.Po
  1044. +include ./$(DEPDIR)/stats.Po
  1045. +include ./$(DEPDIR)/times.Po
  1046. +include ./$(DEPDIR)/tiporder.Po
  1047. +include ./$(DEPDIR)/utilities.Po
  1048. +include ./$(DEPDIR)/xml.Po
  1049. +
  1050. +.c.o:
  1051. + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  1052. + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  1053. +# $(AM_V_CC) \
  1054. +# source='$<' object='$@' libtool=no \
  1055. +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
  1056. +# $(COMPILE) -c $<
  1057. +
  1058. +.c.obj:
  1059. + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
  1060. + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  1061. +# $(AM_V_CC) \
  1062. +# source='$<' object='$@' libtool=no \
  1063. +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
  1064. +# $(COMPILE) -c `$(CYGPATH_W) '$<'`
  1065. +
  1066. +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  1067. + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  1068. + unique=`for i in $$list; do \
  1069. + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  1070. + done | \
  1071. + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  1072. + END { if (nonempty) { for (i in files) print i; }; }'`; \
  1073. + mkid -fID $$unique
  1074. +tags: TAGS
  1075. +
  1076. +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
  1077. + $(TAGS_FILES) $(LISP)
  1078. + set x; \
  1079. + here=`pwd`; \
  1080. + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  1081. + unique=`for i in $$list; do \
  1082. + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  1083. + done | \
  1084. + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  1085. + END { if (nonempty) { for (i in files) print i; }; }'`; \
  1086. + shift; \
  1087. + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  1088. + test -n "$$unique" || unique=$$empty_fix; \
  1089. + if test $$# -gt 0; then \
  1090. + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  1091. + "$$@" $$unique; \
  1092. + else \
  1093. + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  1094. + $$unique; \
  1095. + fi; \
  1096. + fi
  1097. +ctags: CTAGS
  1098. +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
  1099. + $(TAGS_FILES) $(LISP)
  1100. + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  1101. + unique=`for i in $$list; do \
  1102. + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  1103. + done | \
  1104. + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  1105. + END { if (nonempty) { for (i in files) print i; }; }'`; \
  1106. + test -z "$(CTAGS_ARGS)$$unique" \
  1107. + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  1108. + $$unique
  1109. +
  1110. +GTAGS:
  1111. + here=`$(am__cd) $(top_builddir) && pwd` \
  1112. + && $(am__cd) $(top_srcdir) \
  1113. + && gtags -i $(GTAGS_ARGS) "$$here"
  1114. +
  1115. +distclean-tags:
  1116. + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  1117. +
  1118. +distdir: $(DISTFILES)
  1119. + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  1120. + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  1121. + list='$(DISTFILES)'; \
  1122. + dist_files=`for file in $$list; do echo $$file; done | \
  1123. + sed -e "s|^$$srcdirstrip/||;t" \
  1124. + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
  1125. + case $$dist_files in \
  1126. + */*) $(MKDIR_P) `echo "$$dist_files" | \
  1127. + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
  1128. + sort -u` ;; \
  1129. + esac; \
  1130. + for file in $$dist_files; do \
  1131. + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  1132. + if test -d $$d/$$file; then \
  1133. + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
  1134. + if test -d "$(distdir)/$$file"; then \
  1135. + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  1136. + fi; \
  1137. + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  1138. + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
  1139. + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  1140. + fi; \
  1141. + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
  1142. + else \
  1143. + test -f "$(distdir)/$$file" \
  1144. + || cp -p $$d/$$file "$(distdir)/$$file" \
  1145. + || exit 1; \
  1146. + fi; \
  1147. + done
  1148. +check-am: all-am
  1149. +check: check-am
  1150. +all-am: Makefile $(PROGRAMS)
  1151. +installdirs:
  1152. + for dir in "$(DESTDIR)$(bindir)"; do \
  1153. + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  1154. + done
  1155. +install: install-am
  1156. +install-exec: install-exec-am
  1157. +install-data: install-data-am
  1158. +uninstall: uninstall-am
  1159. +
  1160. +install-am: all-am
  1161. + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  1162. +
  1163. +installcheck: installcheck-am
  1164. +install-strip:
  1165. + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  1166. + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  1167. + `test -z '$(STRIP)' || \
  1168. + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  1169. +mostlyclean-generic:
  1170. +
  1171. +clean-generic:
  1172. +
  1173. +distclean-generic:
  1174. + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  1175. + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  1176. +
  1177. +maintainer-clean-generic:
  1178. + @echo "This command is intended for maintainers to use"
  1179. + @echo "it deletes files that may require special tools to rebuild."
  1180. +clean: clean-am
  1181. +
  1182. +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
  1183. +
  1184. +distclean: distclean-am
  1185. + -rm -rf ./$(DEPDIR)
  1186. + -rm -f Makefile
  1187. +distclean-am: clean-am distclean-compile distclean-generic \
  1188. + distclean-tags
  1189. +
  1190. +dvi: dvi-am
  1191. +
  1192. +dvi-am:
  1193. +
  1194. +html: html-am
  1195. +
  1196. +html-am:
  1197. +
  1198. +info: info-am
  1199. +
  1200. +info-am:
  1201. +
  1202. +install-data-am:
  1203. +
  1204. +install-dvi: install-dvi-am
  1205. +
  1206. +install-dvi-am:
  1207. +
  1208. +install-exec-am: install-binPROGRAMS
  1209. +
  1210. +install-html: install-html-am
  1211. +
  1212. +install-html-am:
  1213. +
  1214. +install-info: install-info-am
  1215. +
  1216. +install-info-am:
  1217. +
  1218. +install-man:
  1219. +
  1220. +install-pdf: install-pdf-am
  1221. +
  1222. +install-pdf-am:
  1223. +
  1224. +install-ps: install-ps-am
  1225. +
  1226. +install-ps-am:
  1227. +
  1228. +installcheck-am:
  1229. +
  1230. +maintainer-clean: maintainer-clean-am
  1231. + -rm -rf ./$(DEPDIR)
  1232. + -rm -f Makefile
  1233. +maintainer-clean-am: distclean-am maintainer-clean-generic
  1234. +
  1235. +mostlyclean: mostlyclean-am
  1236. +
  1237. +mostlyclean-am: mostlyclean-compile mostlyclean-generic
  1238. +
  1239. +pdf: pdf-am
  1240. +
  1241. +pdf-am:
  1242. +
  1243. +ps: ps-am
  1244. +
  1245. +ps-am:
  1246. +
  1247. +uninstall-am: uninstall-binPROGRAMS
  1248. +
  1249. +.MAKE: install-am install-strip
  1250. +
  1251. +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
  1252. + clean-generic ctags distclean distclean-compile \
  1253. + distclean-generic distclean-tags distdir dvi dvi-am html \
  1254. + html-am info info-am install install-am install-binPROGRAMS \
  1255. + install-data install-data-am install-dvi install-dvi-am \
  1256. + install-exec install-exec-am install-html install-html-am \
  1257. + install-info install-info-am install-man install-pdf \
  1258. + install-pdf-am install-ps install-ps-am install-strip \
  1259. + installcheck installcheck-am installdirs maintainer-clean \
  1260. + maintainer-clean-generic mostlyclean mostlyclean-compile \
  1261. + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
  1262. + uninstall-am uninstall-binPROGRAMS
  1263. +
  1264. +
  1265. +# all-am: intro $(bin_PROGRAMS)$(EXEEXT)
  1266. +all-am: intro $(bin_PROGRAMS)
  1267. + @echo ""
  1268. + @echo "Done."
  1269. +
  1270. +intro:
  1271. + @echo ""
  1272. + @echo ""
  1273. + @echo ":: Building [$(bin_PROGRAMS)]. Version $(VERSION) ::"
  1274. + @echo ""
  1275. + @echo ""
  1276. +
  1277. +# Tell versions [3.59,3.63) of GNU make to not export all variables.
  1278. +# Otherwise a system limit (for SysV at least) may be exceeded.
  1279. +.NOEXPORT:
  1280. unchanged:
  1281. --- ./phyml-20120412/src/mcmc.c 2012-03-20 14:10:49.000000000 +1300
  1282. +++ ./phyml-20120412-new-bak/src/mcmc.c 2013-02-18 21:51:51.459662430 +1300
  1283. @@ -1977,7 +1977,7 @@
  1284. if(tree->mod->n_catg > 1)
  1285. {
  1286. if(tree->mod->free_mixt_rates == NO)
  1287. - PhyML_Fprintf(fp,"%G\t",tree->mod->alpha);
  1288. + PhyML_Fprintf(fp,"%G\t",tree->mod->alpha->v);
  1289. else
  1290. {
  1291. For(i,tree->mod->n_catg) PhyML_Fprintf(fp,"%G\t",tree->mod->gamma_r_proba->v[i]);
  1292. unchanged:
  1293. --- ./phyml-20120412/src/optimiz.c 2012-03-13 19:04:03.000000000 +1300
  1294. +++ ./phyml-20120412-new-bak/src/optimiz.c 2013-02-18 21:51:51.462662427 +1300
  1295. @@ -979,29 +979,18 @@
  1296. if((tree->mod->s_opt->opt_free_mixt_rates) && (tree->mod->free_mixt_rates == YES))
  1297. {
  1298. - /* int failed; */
  1299. + int failed;
  1300. int i;
  1301. - /* failed = 0; */
  1302. - /* tree->mod->update_eigen = 1; */
  1303. - /* BFGS(tree,tree->mod->gamma_r_proba_unscaled,tree->mod->n_catg,1.e-5,1.e-5, */
  1304. - /* &Return_Abs_Lk, */
  1305. - /* &Num_Derivative_Several_Param, */
  1306. - /* &Lnsrch_Free_Mixt_Rates,&failed); */
  1307. -
  1308. if(verbose) Print_Lk(tree,"[Rate class freqs. ]");
  1309. + failed = 0;
  1310. + tree->mod->update_eigen = 1;
  1311. + BFGS(tree,tree->mod->gamma_r_proba_unscaled,tree->mod->n_catg,1.e-5,1.e-5,
  1312. + &Return_Abs_Lk,
  1313. + &Num_Derivative_Several_Param,
  1314. + &Lnsrch_Free_Mixt_Rates,&failed);
  1315. - /* For(i,tree->mod->n_catg-1) */
  1316. - /* { */
  1317. - /* Generic_Brent_Lk(&(tree->mod->gamma_r_proba_unscaled->v[i]), */
  1318. - /* 0., */
  1319. - /* 100, */
  1320. - /* tree->mod->s_opt->min_diff_lk_global, */
  1321. - /* tree->mod->s_opt->brent_it_max, */
  1322. - /* tree->mod->s_opt->quickdirty, */
  1323. - /* Wrap_Lk,NULL,tree,NULL); */
  1324. - /* } */
  1325. tree->mod->gamma_r_proba_unscaled->v[tree->mod->n_catg-1] = 100.;
  1326. For(i,tree->mod->n_catg-1)
  1327. unchanged:
  1328. --- ./phyml-20120412/src/tree 1970-01-01 12:00:00.000000000 +1200
  1329. +++ ./phyml-20120412-new-bak/src/tree 2013-02-19 10:09:36.962892889 +1300
  1330. @@ -0,0 +1 @@
  1331. +((((((tax6:0.01,(tax5:0.01,tax1:0.026):0.008):0.003,(tax7:0.003,tax3:0.003):0.01271127):0.01,tax2:0.01):0.01,tax10:0.01):0.01,tax9:0.01):0.01,tax8:0.01,tax4:0.1);
  1332. \ No newline at end of file
  1333. unchanged:
  1334. --- ./phyml-20120412/src/utilities.c 2012-04-11 11:48:30.000000000 +1200
  1335. +++ ./phyml-20120412-new-bak/src/utilities.c 2013-02-19 10:16:57.770281203 +1300
  1336. @@ -1668,6 +1668,7 @@
  1337. Detect_Align_File_Format(io);
  1338. +
  1339. switch(io->data_file_format)
  1340. {
  1341. case PHYLIP:
  1342. @@ -1861,7 +1862,7 @@
  1343. {
  1344. if(!Get_Token(fp,token)) break;
  1345. -/* PhyML_Printf("\n+ Token: '%s' next_token=%d cur_token=%d",token,nxt_token_t,cur_token_t); */
  1346. + PhyML_Printf("\n+ Token: '%s' next_token=%d cur_token=%d",token,nxt_token_t,cur_token_t);
  1347. if(token[0] == ';')
  1348. {
  1349. @@ -1940,7 +1941,7 @@
  1350. }
  1351. while(c != '"');
  1352. *token = c;
  1353. - c = fgetc(fp);
  1354. + /* c = fgetc(fp); */
  1355. if(c == EOF) return 0;
  1356. *(token+1) = '\0';
  1357. return 1;
  1358. @@ -1950,6 +1951,8 @@
  1359. {
  1360. Skip_Comment(fp);
  1361. c = fgetc(fp);
  1362. + *token = c;
  1363. + token++;
  1364. if(c == EOF) return 0;
  1365. return 1;
  1366. }
  1367. @@ -1967,7 +1970,7 @@
  1368. else if(c == '-') { *token = c; token++; }
  1369. else
  1370. {
  1371. - while(isgraph(c) && c != ';' && c != '-' && c != ',')
  1372. + while(isgraph(c) && c != ';' && c != '-' && c != ',' && c != '=')
  1373. {
  1374. *(token++) = c;
  1375. c = fgetc(fp);
  1376. @@ -2308,8 +2311,6 @@
  1377. }
  1378. -
  1379. -
  1380. //////////////////////////////////////////////////////////////
  1381. //////////////////////////////////////////////////////////////
  1382. @@ -7756,7 +7757,7 @@
  1383. #ifndef PHYTIME
  1384. mod->l_min = 1.E-8;
  1385. - mod->l_max = 100.0;
  1386. + mod->l_max = 10.0;
  1387. #else
  1388. mod->l_min = 1.E-8;
  1389. mod->l_max = 2.0;
  1390. @@ -8049,11 +8050,23 @@
  1391. t_node **bip1, **bip2;
  1392. int bip_size1, bip_size2, bip_size;
  1393. int different,identical;
  1394. + int n_edges;
  1395. /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
  1396. /* WARNING: call Match_Tip_Numbers and Get_Bip before using this function. */
  1397. /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
  1398. + if(on_existing_edges_only == YES)
  1399. + {
  1400. + n_edges = 0;
  1401. + For(i,2*tree1->n_otu-3)
  1402. + if(tree1->t_edges[i]->does_exist && tree2->t_edges[i]->does_exist) n_edges++;
  1403. + n_edges -= tree1->n_otu;
  1404. + }
  1405. + else
  1406. + {
  1407. + n_edges = tree1->n_otu-3;
  1408. + }
  1409. identical = 0;
  1410. different = 0;
  1411. @@ -8070,7 +8083,7 @@
  1412. bip_size2 = MIN(b2->left->bip_size[b2->l_r],b2->rght->bip_size[b2->r_l]);
  1413. if(bip_size2 > 1 && ((on_existing_edges_only == YES && b2->does_exist) || (on_existing_edges_only == NO)))
  1414. - {
  1415. + {
  1416. if(bip_size1 == bip_size2)
  1417. {
  1418. bip_size = bip_size1;
  1419. @@ -8139,17 +8152,21 @@
  1420. b1->bip_score++;
  1421. b2->bip_score++;
  1422. identical++;
  1423. - break;
  1424. + goto out;
  1425. + }
  1426. + else
  1427. + {
  1428. + different++; // Bipartitions have identical sizes but distinct elements
  1429. }
  1430. - else different++; // Bipartitions has identical size but distinct elements
  1431. }
  1432. else different++; // Biparition have different sizes
  1433. }
  1434. }
  1435. }
  1436. + out: ;
  1437. }
  1438. -
  1439. - return different;
  1440. + return n_edges - identical;
  1441. + /* return different; */
  1442. }
  1443. //////////////////////////////////////////////////////////////
  1444. @@ -12242,6 +12259,9 @@
  1445. aLRT(tree);
  1446. + Br_Len_Involving_Invar(tree);
  1447. + Rescale_Br_Len_Multiplier_Tree(tree);
  1448. +
  1449. Free(s_tree);
  1450. s_tree = Write_Tree(tree,NO);
  1451. @@ -12481,6 +12501,9 @@
  1452. Warn_And_Exit("");
  1453. }
  1454. +
  1455. + if(node_list_size == 1) return node_list[0];
  1456. +
  1457. list = (t_node ***)mCalloc(node_list_size,sizeof(t_node **));
  1458. For(i,node_list_size) list[i] = (t_node **)mCalloc(2*tree->n_otu-1,sizeof(t_node *));
  1459. size = (int *)mCalloc(node_list_size,sizeof(int));
  1460. unchanged:
  1461. --- ./phyml-20120412/src/utilities.h 2012-04-11 11:39:02.000000000 +1200
  1462. +++ ./phyml-20120412-new-bak/src/utilities.h 2013-02-18 21:51:51.452662435 +1300
  1463. @@ -272,6 +272,8 @@
  1464. /* #define P_LK_LIM_SUP 2.037035976e+90 /\* R: format(2^(+300),digits=10) *\/ */
  1465. #define P_LK_LIM_INF 3.054936e-151 /* 2^-500 */
  1466. #define P_LK_LIM_SUP 3.273391e+150 /* 2^500 */
  1467. +/* #define P_LK_LIM_INF 1.499697e-241 /\* 2^-800 *\/ */
  1468. +/* #define P_LK_LIM_SUP 6.668014e+240 /\* 2^800 *\/ */
  1469. /*!********************************************************/
  1470. unchanged:
  1471. --- utilities.c 2013-10-31 08:57:09.622430940 +1300
  1472. +++ utilities.new.c 2013-10-31 08:55:49.522433717 +1300
  1473. @@ -4769,8 +4769,6 @@
  1474. t_node *n_e, *n_f;
  1475. n_otu = t_full->n_otu;
  1476. - t_empt->n_root = t_full->n_root;
  1477. - t_empt->e_root = t_full->e_root;
  1478. t_empt->c_lnL_sorted = t_full->c_lnL_sorted;
  1479. t_empt->log_site_lk_cat = t_full->log_site_lk_cat;
  1480. t_empt->cur_site_lk = t_full->cur_site_lk;
  1481. @@ -6993,6 +6991,7 @@
  1482. boot_tree->mat = boot_mat;
  1483. }
  1484. +
  1485. boot_tree->mod = boot_mod;
  1486. boot_tree->io = tree->io;
  1487. boot_tree->data = boot_data;
  1488. @@ -7002,6 +7001,7 @@
  1489. boot_tree->io->print_site_lnl = 0;
  1490. boot_tree->io->print_trace = 0;
  1491. +
  1492. if((boot_tree->mod->s_opt->random_input_tree) && (boot_tree->mod->s_opt->topo_search == SPR_MOVE)) Random_Tree(boot_tree);
  1493. Order_Tree_CSeq(boot_tree,boot_data);
  1494. Share_Lk_Struct(tree,boot_tree);
  1495. @@ -7010,6 +7010,7 @@
  1496. Fill_Dir_Table(boot_tree);
  1497. Update_Dirs(boot_tree);
  1498. +
  1499. if(tree->mod->s_opt->greedy) Init_P_Lk_Tips_Double(boot_tree);
  1500. else Init_P_Lk_Tips_Int(boot_tree);
  1501. Init_Ui_Tips(boot_tree);
  1502. @@ -13307,11 +13308,15 @@
  1503. Warn_And_Exit("");
  1504. }
  1505. + has_outgrp = NO;
  1506. +
  1507. + /* 'Root' node is t_nodes[0] */
  1508. if(strstr(tree->t_nodes[0]->name,"*"))
  1509. {
  1510. /* PhyML_Printf("\n. Found outgroup taxon: %s",tree->t_nodes[0]->name); */
  1511. tree->t_nodes[0]->s_ingrp[0] = 0;
  1512. tree->t_nodes[0]->s_outgrp[0] = 1;
  1513. + has_outgrp = YES;
  1514. }
  1515. else
  1516. {
  1517. @@ -13319,7 +13324,6 @@
  1518. tree->t_nodes[0]->s_outgrp[0] = 0;
  1519. }
  1520. - has_outgrp = NO;
  1521. Get_Best_Root_Position_Post(tree->t_nodes[0],tree->t_nodes[0]->v[0],&has_outgrp,tree);
  1522. Get_Best_Root_Position_Pre(tree->t_nodes[0],tree->t_nodes[0]->v[0],tree);
  1523. only in patch2:
  1524. unchanged:
  1525. --- src/utilities.c 2012-04-11 11:48:30.000000000 +1200
  1526. +++ src.new/utilities.c 2013-11-12 14:19:11.600689913 +1300
  1527. @@ -13995,7 +13995,7 @@ int Check_Topo_Constraints(t_tree *big_t
  1528. For(i,2*big_tree_cpy->n_otu-3) big_tree_cpy->t_edges[i]->bip_score = 0;
  1529. For(i,2*small_tree->n_otu-3) small_tree->t_edges[i]->bip_score = 0;
  1530. - diffs = Compare_Bip(small_tree,big_tree_cpy,YES);
  1531. + diffs = Compare_Bip(small_tree,big_tree_cpy,NO);
  1532. /* printf("\n"); */
  1533. /* printf("\n. %s",Write_Tree(big_tree_cpy,NO)); */