Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 93f2a7e0 authored by Carine Rey's avatar Carine Rey
Browse files

add tree prefix in description of t_choices

parent 531184f6
......@@ -309,7 +309,7 @@ let derive_profile ?(indir = "") ?(ns = 0) ~preview ~fast_mode ~no_Ne ~ne_test ~
else
derive_det ~dataset_l ~preview ~fast_mode
in
let post_analyses_res = Post_analyses.post_analyses_res_of_dataset_results_l ~dataset_results_l in
let post_analyses_res = Post_analyses.post_analyses_res_of_dataset_results_l ~tree_prefix ~dataset_results_l in
let repo_per_tree = [
Dataset.repo dataset_l ~preview ;
Repo.shift "Results_per_hypothesis" (repo_of_dataset_results_l ~dataset_results_l);
......
......@@ -63,7 +63,7 @@ let build_cmd_t_choices (opt_name : string) mr_option =
| Some x -> [opt opt_name dep x]
| None -> []
let make_t_choices ~haPCOC_mr
let make_t_choices ?(tree_prefix="") ~haPCOC_mr
~h0_NeG1_mr ~h0_NeG2_mr ~h0_NeG3_mr ~h0_NeG4_mr ~h0_NeG5_mr
~haPC_NeG1_mr ~haPC_NeG2_mr ~haPC_NeG3_mr ~haPC_NeG4_mr ~haPC_NeG5_mr
~haPC_NeG5_NeC_div2_mr
......@@ -91,7 +91,7 @@ let make_t_choices ~haPCOC_mr
("--HaPCOC" , haPCOC_mr );
] ~f:(fun (opt_name, mr_option) -> build_cmd_t_choices opt_name mr_option)
|> List.concat in
workflow ~descr:"post_analyses.t_choices" [
workflow ~descr:("post_analyses.t_choices." ^ tree_prefix) [
docker env (
and_list [
mkdir_p dest ;
......@@ -190,7 +190,7 @@ type res_all_hyp = {
h0_NeG5_NeC_x2_res : dataset_res option ;
}
let make_t_choices_per_couple {ha_PCOC_res;
let make_t_choices_per_couple ~tree_prefix {ha_PCOC_res;
h0_NeG1_res; h0_NeG2_res; h0_NeG3_res; h0_NeG4_res; h0_NeG5_res;
haPC_NeG1_res;
haPC_NeG2_res;
......@@ -221,7 +221,7 @@ let make_t_choices_per_couple {ha_PCOC_res;
let h0_NeG5_NeC_div2_mr = get_merged_results_opt h0_NeG5_NeC_div2_res in
let h0_NeG5_NeC_x2_mr = get_merged_results_opt h0_NeG5_NeC_x2_res in
make_t_choices ~haPCOC_mr
make_t_choices ~tree_prefix ~haPCOC_mr
~h0_NeG1_mr
~h0_NeG2_mr
~h0_NeG3_mr
......@@ -239,7 +239,7 @@ let make_t_choices_per_couple {ha_PCOC_res;
()
let get_t_choices ~(dataset_results_l: dataset_res list) : t_choices option =
let get_t_choices ~tree_prefix ~(dataset_results_l: dataset_res list) : t_choices option =
let ha_PCOC_res = List.find dataset_results_l (is_hyp ~hyp: "HaPCOC" ) in
......@@ -262,7 +262,7 @@ let get_t_choices ~(dataset_results_l: dataset_res list) : t_choices option =
match (ha_PCOC_res) with
| ( Some ha_PCOC) ->
let t_choices_dir = make_t_choices_per_couple {ha_PCOC_res;
let t_choices_dir = make_t_choices_per_couple ~tree_prefix {ha_PCOC_res;
h0_NeG1_res; h0_NeG2_res; h0_NeG3_res; h0_NeG4_res; h0_NeG5_res;
haPC_NeG1_res; haPC_NeG2_res;haPC_NeG3_res; haPC_NeG4_res; haPC_NeG5_res;
haPC_NeG5_NeC_div2_res; haPC_NeG5_NeC_x2_res; h0_NeG5_NeC_div2_res; h0_NeG5_NeC_x2_res} in
......@@ -307,8 +307,8 @@ let get_simu_infos ~(dataset:Dataset.t) =
| None -> None (*make_simu_infos ~faa ~tree_sc*)
let post_analyses_res_of_dataset_results_l ~dataset_results_l =
let t_choices = get_t_choices ~dataset_results_l in
let post_analyses_res_of_dataset_results_l ~tree_prefix ~dataset_results_l =
let t_choices = get_t_choices ~tree_prefix ~dataset_results_l in
let auto_t_plot_l = plot_det_meth_res_auto_t ~t_choices ~dataset_results_l in
{t_choices; auto_t_plot_l;dataset_results_l}
......
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