📣 An issue occured with the embedded container registry on October 25 2021, between 10:30 and 12:10 (UTC+2). Any persisting issues should be reported to CC-IN2P3 Support. 🐛

Commit 27b344e6 authored by Carine Rey's avatar Carine Rey
Browse files

add Min in profile.ml + use Unif_3 by default

parent 6481fe5d
......@@ -404,7 +404,7 @@ let validation_main ~outdir ?(indir = "") ?(ns = 0) ?(np = 2) ?(mem = 2) ~previe
(* simulated trees *)
Random.init seed ;
let nb_sites = if ns = 0 then (if preview then 20 else 50) else ns in
let profile = Profile.profile_l_of_splitted_profile ~nb_cat:Dist ~nb_sites profile_fn ~seed:(Random.int Int.max_value) in
let profile = Profile.profile_l_of_splitted_profile ~nb_cat:Unif_3 ~nb_sites profile_fn ~seed:(Random.int Int.max_value) in
let sim_repo_l = derive_profile ~indir ~ns ~preview ~fast_mode ~no_Ne ~ne_test ~no_HaPC ~tree_dir ~profile ~use_concat ~add_indels ~only_simu ~seed () in
(* real trees *)
let indir_dataset_l = if indir = "" then [] else parse_input_data ~seed indir in
......
......@@ -50,6 +50,7 @@ let cat_file ~(f_l: text_file workflow list) : text_file workflow =
type profile_choice =
| All
| Dist
| Min
| Unif_3
let profile_l_of_splitted_profile ~nb_cat ~nb_sites profile_fn ~seed =
......@@ -58,6 +59,7 @@ let profile_l_of_splitted_profile ~nb_cat ~nb_sites profile_fn ~seed =
let dist_bins = match nb_cat with
| Unif_3 -> "[0.01,0.4],[0.4,0.6],[0.6,2]"
| Dist -> "[0.6,2]"
| Min -> "[0,0.2]"
| All -> "[0.01,2]"
in
let splitted_profile = split_profile ~nb_sites ~dist_bins profile_f ~seed in
......@@ -72,5 +74,9 @@ let profile_l_of_splitted_profile ~nb_cat ~nb_sites profile_fn ~seed =
let p0 = splitted_profile / selector ["profile_0.tsv"] in
{profile_c=p0 ; profile_n=prefix ^ "_1categorie_max_dist" ; profile_f};
)
| Min -> (
let p0 = splitted_profile / selector ["profile_0.tsv"] in
{profile_c=p0 ; profile_n=prefix ^ "_1categorie_small_dist" ; profile_f};
)
| All -> (let p0 = splitted_profile / selector ["profile_0.tsv"] in
{profile_c=p0; profile_n=prefix ; profile_f})
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