Skip to content

Commit

Permalink
Fixed main and checked that cargo test and run are working
Browse files Browse the repository at this point in the history
  • Loading branch information
jhellewell14 committed Jul 26, 2024
1 parent ed3b6a8 commit b5cb135
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 65 deletions.
18 changes: 5 additions & 13 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
51 changes: 0 additions & 51 deletions tests/test_files_in/listeria0.phylip_phyml_stats.txt

This file was deleted.

1 change: 0 additions & 1 deletion tests/test_files_in/listeria0.phylip_phyml_tree.txt

This file was deleted.

0 comments on commit b5cb135

Please sign in to comment.