Commit 12a98cd8 authored by Carine Rey's avatar Carine Rey
Browse files

rm ns * 10 pour H0 (imcompatible avec 3 categories dans l'etat)

parent cbbc83e0
......@@ -47,12 +47,7 @@ let parse_input_data indir =
let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~preview ~ns =
let model_prefix = Convergence_hypothesis.string_of_model model in
let nb_sites = match model with
| H0 -> ns * 10
| H0_NeBig -> ns * 10
| H0_NeSmall -> ns * 10
| _ -> ns
in
let nb_sites = ns in
let nodes = Tree_dataset.nodes tree_dataset model in
let tree = Tree_dataset.tree tree_dataset `Simulation in
let descr = "."^model_prefix^"."^tree_prefix in
......@@ -339,7 +334,6 @@ let simulation_main ~outdir ?(ns = 0) ?(np = 2) ?(mem = 2) ~tree_dir ~profile_fn
let validation_main ~outdir ?(indir = "") ?(ns = 0) ?(np = 2) ?(mem = 2) ~preview ~fast_mode ~no_Ne ~ne_test ~no_HaPC ~tree_dir ~profile_fn ~use_concat ~only_simu () =
(* simulated trees *)
let nb_sites = if ns = 0 then (if preview then 20 else 50) else ns in
let nb_sites = nb_sites * 10 in
let profile = Profile.profile_l_of_splitted_profile ~nb_cat:3 ~nb_sites profile_fn in
let sim_repo_l = derive_profile ~indir ~ns ~preview ~fast_mode ~no_Ne ~ne_test ~no_HaPC ~tree_dir ~profile ~use_concat ~only_simu () in
(* real trees *)
......
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