diff --git a/src/lib.rs b/src/lib.rs index 77cf439..16b30e1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -42,28 +42,20 @@ pub fn main() { // let mut tr = vector_to_tree(&random_vector(4)); // tr.add_genetic_data(&String::from("/Users/joel/Downloads/listeria0.aln")); - // println!("{:?}", tr.mutation_lists); let mut tr = vector_to_tree(&random_vector(27)); tr.add_genetic_data(&args.alignment); - // println!("{:?}", tr.nodes.get(4)); tr.initialise_likelihood(&q); println!("{}", tr.get_tree_likelihood()); - // tr.update(&random_vector(27)); - // let y: ChangeOrder = tr.changeiter(); - // println!("{:?}", y); - // println!("{:?}", tr.mutation_lists); println!("{:?}", tr.newick()); - // println!("{:?}", tr.mutation_lists.get(2)); - // println!("{:?}", tr.mutation_lists.get(3)); println!("{:?}", tr.tree_vec); if !args.no_optimise { - // let start = Instant::now(); - // tr.hillclimb(&q, 50); - // let end = Instant::now(); + let start = Instant::now(); + tr.hillclimb(&q, 50); + let end = Instant::now(); - // eprintln!("Done in {}s", end.duration_since(start).as_secs()); - // eprintln!("Done in {}s", end.duration_since(start).as_millis()); + eprintln!("Done in {}s", end.duration_since(start).as_secs()); + eprintln!("Done in {}s", end.duration_since(start).as_millis()); } } diff --git a/tests/test_files_in/listeria0.phylip_phyml_stats.txt b/tests/test_files_in/listeria0.phylip_phyml_stats.txt deleted file mode 100644 index 1993b58..0000000 --- a/tests/test_files_in/listeria0.phylip_phyml_stats.txt +++ /dev/null @@ -1,51 +0,0 @@ - - oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo - --- PhyML 3.3.20230824 --- - http://www.atgc-montpellier.fr/phyml - Copyright CNRS - Universite Montpellier - oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo - -. Sequence filename: listeria0.phylip -. Data set: #1 -. Initial tree: user tree (/private/var/folders/ss/qgjmhnjd4055mzzp7krhs2ww0000gp/T/tree.nwk) -. Model of nucleotides substitution: JC69 -. Number of taxa: 28 -. Log-likelihood: -603663.21632 -. Unconstrained log-likelihood: -83671.88405 -. Composite log-likelihood: -673655.88184 -. Parsimony: 854 -. Tree size: 54.00000 -. Discrete gamma model: Yes - - Number of classes: 1 - - Gamma shape parameter: 1.000 - - Relative rate in class 1: 1.00000 [freq=1.000000] -. Nucleotides frequencies: - - f(A)= 0.25000 - - f(C)= 0.25000 - - f(G)= 0.25000 - - f(T)= 0.25000 - -. Run ID: none -. Random seed: 1720094886 -. Subtree patterns aliasing: no -. Version: 3.3.20230824 -. Time used: 0h0m0s (0 seconds) - - oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo - Suggested citations: - S. Guindon, JF. Dufayard, V. Lefort, M. Anisimova, W. Hordijk, O. Gascuel - "New algorithms and methods to estimate maximum-likelihood phylogenies: assessing the performance of PhyML 3.0." - Systematic Biology. 2010. 59(3):307-321. - - S. Guindon & O. Gascuel - "A simple, fast, and accurate algorithm to estimate large phylogenies by maximum likelihood" - Systematic Biology. 2003. 52(5):696-704. - oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo - - - Please consider making a donation to support PhyML development by clicking on the following link: - - https://fondation-cnrs.org/faire-un-don/ - - ~ Thank you ! ~ - diff --git a/tests/test_files_in/listeria0.phylip_phyml_tree.txt b/tests/test_files_in/listeria0.phylip_phyml_tree.txt deleted file mode 100644 index aaacb09..0000000 --- a/tests/test_files_in/listeria0.phylip_phyml_tree.txt +++ /dev/null @@ -1 +0,0 @@ -(((15:1.00000000,(11:1.00000000,((24:1.00000000,19:1.00000000)0.000000:1.00000000,(6:1.00000000,(17:1.00000000,(26:1.00000000,2:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:2.00000000,((14:1.00000000,(27:1.00000000,(((21:1.00000000,(13:1.00000000,10:1.00000000)0.000000:1.00000000)0.000000:1.00000000,(4:1.00000000,(16:1.00000000,(25:1.00000000,(22:1.00000000,((23:1.00000000,18:1.00000000)0.000000:1.00000000,(9:1.00000000,3:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000,1:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000,(5:1.00000000,0:1.00000000)0.000000:1.00000000)0.000000:1.00000000)0.000000:1.00000000,20:1.00000000,(8:1.00000000,(12:1.00000000,7:1.00000000)0.000000:1.00000000)0.000000:1.00000000);