Commit fd5ff577 authored by Carine Rey's avatar Carine Rey
Browse files

fix error: bad input tree in the outdir (but broken link)

parent 99b996a3
......@@ -6,7 +6,7 @@ open File_formats
open Defs
open Convergence_detection
let derive_from_model ~model ~tree ~tree_dataset ~tree_prefix ~profile_f ~preview =
let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile_f ~preview =
let model_prefix = Convergence_hypothesis.string_of_model model in
let nb_sites = if preview then 20 else 1000 in
let nodes = Tree_dataset.nodes tree_dataset model in
......@@ -28,13 +28,13 @@ let derive_from_model ~model ~tree ~tree_dataset ~tree_prefix ~profile_f ~previe
let fna = Bppsuite.bppseqgen_multi_profiles ~descr ~nb_sites ~tree ~config:config_p ~profile_f ~ne_c in
let faa = Bppsuite.fna2faa ~fna in
let ready_dataset = { Ready_dataset.input_tree = tree ; tree_dataset ; fna; faa} in
let ready_dataset = { Ready_dataset.input_tree = input_tree ; tree_dataset ; fna; faa} in
{ Dataset.model_prefix; tree_prefix; dataset = ready_dataset }
let derive_from_tree ~tree_dir ~tree ~profile_f ~preview =
let tree_prefix = Filename.chop_extension tree in
let tree = input (Filename.concat tree_dir tree) in
let tree_dataset = Tree_dataset.prepare tree in
let input_tree = input (Filename.concat tree_dir tree) in
let tree_dataset = Tree_dataset.prepare input_tree in
let models = Convergence_hypothesis.[
H0;
Ha;
......@@ -44,10 +44,10 @@ let derive_from_tree ~tree_dir ~tree ~profile_f ~preview =
HaNeBig ;
] in
let hypos = List.map models ~f:(fun model ->
derive_from_model ~model ~tree ~tree_dataset ~tree_prefix ~profile_f ~preview
derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile_f ~preview
) in
let ready_dataset_H0 = (derive_from_model ~model:H0 ~tree ~tree_dataset ~tree_prefix ~profile_f ~preview).dataset in
let ready_dataset_Ha = (derive_from_model ~model:Ha ~tree ~tree_dataset ~tree_prefix ~profile_f ~preview).dataset in
let ready_dataset_H0 = (derive_from_model ~model:H0 ~input_tree ~tree_dataset ~tree_prefix ~profile_f ~preview).dataset in
let ready_dataset_Ha = (derive_from_model ~model:Ha ~input_tree ~tree_dataset ~tree_prefix ~profile_f ~preview).dataset in
let hypos_concat =
[{ Dataset.model_prefix="H0+Ha"; tree_prefix; dataset = Ready_dataset.paste ready_dataset_H0 ready_dataset_Ha};]
in
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment