Commit b1cebf4a authored by LANORE Vincent's avatar LANORE Vincent
Browse files

Replaced no_diffsel with --fast option that also disables pcoc_c60

parent 6b50a845
......@@ -186,7 +186,7 @@ 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 ~no_diffsel=
let derive_from_dataset ~dataset ~preview ~fast_mode=
let det_meths = [
[`Pcoc;
`Tdg09;
......@@ -195,15 +195,15 @@ let derive_from_dataset ~dataset ~preview ~no_diffsel=
if preview then
[]
else
[`Pcoc_gamma;`Pcoc_C60;
[`Pcoc_gamma;
`Identical_WAG;
`Topological_WAG;
]
;
if no_diffsel then
if fast_mode then
[]
else
[`Diffsel;`Diffsel_bis;] ;
[`Diffsel;`Diffsel_bis;`Pcoc_C60;] ;
]
|> List.concat in
let res_by_tools = List.map det_meths ~f:(fun det_meth ->
......@@ -219,9 +219,9 @@ let derive_from_dataset ~dataset ~preview ~no_diffsel=
let tree_prefix = dataset.tree_prefix in
{model_prefix; tree_prefix; dataset; res_by_tools ; merged_results ; plot_merged_results}
let derive_det ~dataset_l ~preview ~no_diffsel =
let derive_det ~dataset_l ~preview ~fast_mode =
List.map dataset_l ~f:(fun dataset ->
derive_from_dataset ~preview ~dataset ~no_diffsel)
derive_from_dataset ~preview ~dataset ~fast_mode)
let logger =
Logger.tee [
......@@ -230,9 +230,9 @@ let logger =
Bistro_utils.Html_logger.create "report.html" ;
]
let detection_main ~outdir ~indir ?(np = 2) ?(mem = 2) ~preview ~no_diffsel () =
let detection_main ~outdir ~indir ?(np = 2) ?(mem = 2) ~preview ~fast_mode () =
let dataset_l = parse_input_data indir in
let dataset_results_l = derive_det ~dataset_l ~preview ~no_diffsel in
let dataset_results_l = derive_det ~dataset_l ~preview ~fast_mode in
let repo = repo_of_dataset_results_l ~dataset_results_l in
Repo.build ~outdir ~np ~mem:(`GB mem) ~logger repo
......@@ -242,7 +242,7 @@ let simulation_main ~outdir ?(ns = 0) ?(np = 2) ?(mem = 2) ~tree_dir ~profile_fn
let repo = Dataset.repo dataset_l ~preview in
Repo.build ~outdir ~np ~mem:(`GB mem) ~logger repo
let validation_main ~outdir ~indir ?(ns = 0) ?(np = 2) ?(mem = 2) ~preview ~no_diffsel ~tree_dir ~profile_fn ~use_concat () =
let validation_main ~outdir ~indir ?(ns = 0) ?(np = 2) ?(mem = 2) ~preview ~fast_mode ~tree_dir ~profile_fn ~use_concat () =
let trees = Array.to_list @@ Sys.readdir tree_dir in
let repo = List.map trees ~f:(fun tree ->
let trees = [tree] in
......@@ -250,7 +250,7 @@ let validation_main ~outdir ~indir ?(ns = 0) ?(np = 2) ?(mem = 2) ~preview ~no_d
let dataset_l =
derive_sim ~tree_dir ~trees ~profile_fn ~preview ~use_concat ~ns
@ parse_input_data indir in
let dataset_results_l = derive_det ~dataset_l ~preview ~no_diffsel in
let dataset_results_l = derive_det ~dataset_l ~preview ~fast_mode in
let post_analyses = Post_analyses.post_analyses_of_dataset_results_l ~dataset_results_l in
let repo_per_tree = [
Dataset.repo dataset_l ~preview ;
......@@ -300,14 +300,14 @@ let detection_command =
flag "--indir" (required 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 fast_mode =
flag "--fast" no_arg ~doc:" 'Fast' mode without the most costly methods"
and np =
flag "--np" (optional int) ~doc:"INT Number of available processors"
and mem =
flag "--mem" (optional int) ~doc:"INT Available memory (in GB)"
in
detection_main ~outdir ~indir ?np ?mem ~preview ~no_diffsel
detection_main ~outdir ~indir ?np ?mem ~preview ~fast_mode
]
let validation_command =
......@@ -321,8 +321,8 @@ let validation_command =
flag "--indir" (required 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 fast_mode =
flag "--fast" no_arg ~doc:" 'Fast' mode without the most costly methods"
and use_concat =
flag "--use-concat" no_arg ~doc:" Use concatenation H0+Ha_pcoc"
and ns =
......@@ -336,5 +336,5 @@ let validation_command =
and profile_fn =
flag "--profile-fn" (required string) ~doc:"PATH Path to profile file"
in
validation_main ~outdir ~indir ?ns ?np ?mem ~preview ~no_diffsel ~tree_dir ~profile_fn ~use_concat
validation_main ~outdir ~indir ?ns ?np ?mem ~preview ~fast_mode ~tree_dir ~profile_fn ~use_concat
]
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