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

add --no-diffsel option

parent b72f3527
......@@ -181,12 +181,18 @@ let derive_from_det_meth ~det_meth ~(dataset : Dataset.t) ~preview =
| `Topological_WAG -> `Topological_WAG (Topological.topological ~faa ~tree:tree_id ~tree_conv ~prot_model:"WAG01")
let derive_from_dataset ~dataset ~preview =
let det_meths = [`Pcoc;`Pcoc_gamma;
let derive_from_dataset ~dataset ~preview ~no_diffsel=
let det_meths = [
[`Pcoc;`Pcoc_gamma;
`Tdg09;
`Diffsel;`Diffsel_bis;
`Identical_LG;`Identical_WAG;
`Topological_LG;`Topological_WAG] in
`Topological_LG;`Topological_WAG] ;
if no_diffsel then
[]
else
[`Diffsel;`Diffsel_bis;] ;
]
|> List.concat in
let res_by_tools = List.map det_meths ~f:(fun det_meth ->
derive_from_det_meth ~det_meth ~dataset ~preview
) in
......@@ -199,11 +205,11 @@ let derive_from_dataset ~dataset ~preview =
let tree_prefix = dataset.tree_prefix in
{model_prefix; tree_prefix; res_by_tools ; merged_results ; plot_merged_results}
let derive_det ~dataset_l ~profile_fn ~preview=
let derive_det ~dataset_l ~profile_fn ~preview ~no_diffsel =
List.map dataset_l ~f:(fun dataset ->
derive_from_dataset ~preview ~dataset)
derive_from_dataset ~preview ~dataset ~no_diffsel)
let main ~outdir ?(indir = "") ?(np = 2) ?(mem = 2) ~tree_dir ~profile_fn ~preview () =
let main ~outdir ?(indir = "") ?(np = 2) ?(mem = 2) ~tree_dir ~profile_fn ~preview ~no_diffsel () =
let logger =
Logger.tee [
Console_logger.create () ;
......@@ -214,7 +220,7 @@ let main ~outdir ?(indir = "") ?(np = 2) ?(mem = 2) ~tree_dir ~profile_fn ~previ
let dataset_real = if indir = "" then [] else parse_input_data indir in
let dataset_simu = derive_sim ~tree_dir ~trees ~profile_fn ~preview in
let dataset_l = List.concat [dataset_real; if indir = "" then dataset_simu else [] ] in
let dataset_results_l = derive_det ~dataset_l ~profile_fn ~preview in
let dataset_results_l = derive_det ~dataset_l ~profile_fn ~preview ~no_diffsel in
let repo = [
Dataset.repo dataset_l ~preview ;
repo_of_dataset_results_l ~dataset_results_l;
......@@ -234,6 +240,8 @@ let command =
flag "--indir" (optional string) ~doc:"PATH Input directory"
and preview =
flag "--preview-mode" no_arg ~doc:" Preview mode"
and no_diffsel =
flag "--no-diffsel" no_arg ~doc:" No diffsel mode"
and np =
flag "--np" (optional int) ~doc:"INT Number of available processors"
and mem =
......@@ -243,5 +251,5 @@ let command =
and profile_fn =
flag "--profile-fn" (required string) ~doc:"PATH Path to profile file"
in
main ~outdir ?indir ?np ?mem ~tree_dir ~profile_fn ~preview
main ~outdir ?indir ?np ?mem ~tree_dir ~profile_fn ~preview ~no_diffsel
]
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