Commit 16858e78 authored by LANORE Vincent's avatar LANORE Vincent
Browse files

Added new hypotheses for this weekend's run.

parent 39680754
......@@ -8,6 +8,7 @@ type t =
| H0_NeG3
| H0_NeG4
| H0_NeG5
| H0_NeG6
| H0_NeG5_NeC_div2
| H0_NeG5_NeC_x2
| HaPC_NeG1
......@@ -15,6 +16,7 @@ type t =
| HaPC_NeG3
| HaPC_NeG4
| HaPC_NeG5
| HaPC_NeG6
| HaPCOC
| HaPC_NeG5_NeC_div2
| HaPC_NeG5_NeC_x2
......@@ -26,6 +28,12 @@ type t =
| HaPC_NeG4_NeC_1
| H0_NeG1_NeC_4
| H0_NeG4_NeC_1
| HaPC_NeG4_NeC_6
| HaPC_NeG4_NeC_2
| HaPC_NeG2_NeC_4
| H0_NeG4_NeC_6
| H0_NeG4_NeC_2
| H0_NeG2_NeC_4
let string_of_model m = match m with
| H0_NeG1 -> "H0_NeG1"
......@@ -33,24 +41,32 @@ let string_of_model m = match m with
| H0_NeG3 -> "H0_NeG3"
| H0_NeG4 -> "H0_NeG4"
| H0_NeG5 -> "H0_NeG5"
| H0_NeG6 -> "H0_NeG6"
| HaPC_NeG1 -> "HaPC_NeG1"
| HaPC_NeG2 -> "HaPC_NeG2"
| HaPC_NeG3 -> "HaPC_NeG3"
| HaPC_NeG4 -> "HaPC_NeG4"
| HaPC_NeG5 -> "HaPC_NeG5"
| HaPC_NeG6 -> "HaPC_NeG6"
| HaPCOC -> "HaPCOC"
| HaPC_NeG5_NeC_div2 -> "HaPC_NeG5_NeC_div2"
| HaPC_NeG5_NeC_x2 -> "HaPC_NeG5_NeC_x2"
| H0_NeG5_NeC_div2 -> "H0_NeG5_NeC_div2"
| H0_NeG5_NeC_x2 -> "H0_NeG5_NeC_x2"
| HaPC_NeG1_NeC_5 -> "HaPC_NeG1_NeC_5"
| HaPC_NeG5_NeC_1 -> "HaPC_NeG5_NeC_1"
| H0_NeG1_NeC_5 -> "H0_NeG1_NeC_5"
| H0_NeG5_NeC_1 -> "H0_NeG5_NeC_1"
| HaPC_NeG5_NeC_1 -> "HaPC_NeG5_NeC_1"
| H0_NeG1_NeC_5 -> "H0_NeG1_NeC_5"
| H0_NeG5_NeC_1 -> "H0_NeG5_NeC_1"
| HaPC_NeG1_NeC_4 -> "HaPC_NeG1_NeC_4"
| HaPC_NeG4_NeC_1 -> "HaPC_NeG4_NeC_1"
| H0_NeG1_NeC_4 -> "H0_NeG1_NeC_4"
| H0_NeG4_NeC_1 -> "H0_NeG4_NeC_1"
| HaPC_NeG4_NeC_1 -> "HaPC_NeG4_NeC_1"
| H0_NeG1_NeC_4 -> "H0_NeG1_NeC_4"
| H0_NeG4_NeC_1 -> "H0_NeG4_NeC_1"
| HaPC_NeG4_NeC_6 -> "HaPC_NeG4_NeC_6"
| HaPC_NeG4_NeC_2 -> "HaPC_NeG4_NeC_2"
| HaPC_NeG2_NeC_4 -> "HaPC_NeG2_NeC_4"
| H0_NeG4_NeC_6 -> "H0_NeG4_NeC_6"
| H0_NeG4_NeC_2 -> "H0_NeG4_NeC_2"
| H0_NeG2_NeC_4 -> "H0_NeG2_NeC_4"
let assign k v =
seq ~sep:"=" [ string k ; v ]
......@@ -111,11 +127,13 @@ let bpp_config_F nodes hyp = [
| H0_NeG3 -> bpp_config_H0_F_Ne
| H0_NeG4 -> bpp_config_H0_F_Ne
| H0_NeG5 -> bpp_config_H0_F_Ne
| H0_NeG6 -> bpp_config_H0_F_Ne
| HaPC_NeG1 -> bpp_config_HaPC_F_Ne
| HaPC_NeG2 -> bpp_config_HaPC_F_Ne
| HaPC_NeG3 -> bpp_config_HaPC_F_Ne
| HaPC_NeG4 -> bpp_config_HaPC_F_Ne
| HaPC_NeG5 -> bpp_config_HaPC_F_Ne
| HaPC_NeG6 -> bpp_config_HaPC_F_Ne
| HaPCOC -> bpp_config_HaPCOC_F
| HaPC_NeG5_NeC_div2 -> bpp_config_HaPC_F_Ne
| HaPC_NeG5_NeC_x2 -> bpp_config_HaPC_F_Ne
......@@ -129,5 +147,11 @@ let bpp_config_F nodes hyp = [
| HaPC_NeG4_NeC_1 -> bpp_config_HaPC_F_Ne
| H0_NeG1_NeC_4 -> bpp_config_H0_F_Ne
| H0_NeG4_NeC_1 -> bpp_config_H0_F_Ne
| HaPC_NeG4_NeC_2 -> bpp_config_HaPC_F_Ne
| HaPC_NeG4_NeC_6 -> bpp_config_HaPC_F_Ne
| HaPC_NeG2_NeC_4 -> bpp_config_HaPC_F_Ne
| H0_NeG4_NeC_6 -> bpp_config_H0_F_Ne
| H0_NeG4_NeC_2 -> bpp_config_H0_F_Ne
| H0_NeG2_NeC_4 -> bpp_config_H0_F_Ne
;
]
......@@ -68,12 +68,14 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
| H0_NeG3 -> 3.
| H0_NeG4 -> 4.
| H0_NeG5 -> 5.
| H0_NeG6 -> 6.
| HaPCOC -> 1.
| HaPC_NeG1-> 1.
| HaPC_NeG2-> 2.
| HaPC_NeG3-> 3.
| HaPC_NeG4-> 4.
| HaPC_NeG5-> 5.
| HaPC_NeG6-> 6.
| HaPC_NeG5_NeC_div2 -> 5.
| HaPC_NeG5_NeC_x2 -> 5.
| H0_NeG5_NeC_div2 -> 5.
......@@ -86,6 +88,12 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
| HaPC_NeG4_NeC_1 -> 4.
| H0_NeG1_NeC_4 -> 1.
| H0_NeG4_NeC_1 -> 4.
| HaPC_NeG4_NeC_6 -> 4.
| HaPC_NeG4_NeC_2 -> 4.
| HaPC_NeG2_NeC_4 -> 2.
| H0_NeG4_NeC_6 -> 4.
| H0_NeG4_NeC_2 -> 4.
| H0_NeG2_NeC_4 -> 2.
in
let ne_c = match model with
| H0_NeG1 -> ne_g
......@@ -93,12 +101,14 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
| H0_NeG3 -> ne_g
| H0_NeG4 -> ne_g
| H0_NeG5 -> ne_g
| H0_NeG6 -> ne_g
| HaPCOC -> ne_g
| HaPC_NeG1-> ne_g
| HaPC_NeG2-> ne_g
| HaPC_NeG3-> ne_g
| HaPC_NeG4-> ne_g
| HaPC_NeG5-> ne_g
| HaPC_NeG6-> ne_g
| HaPC_NeG5_NeC_div2 -> ne_g /. 2.
| HaPC_NeG5_NeC_x2 -> ne_g *. 2.
| H0_NeG5_NeC_div2 -> ne_g /. 2.
......@@ -111,6 +121,12 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
| HaPC_NeG4_NeC_1 -> 1.
| H0_NeG1_NeC_4 -> 4.
| H0_NeG4_NeC_1 -> 1.
| HaPC_NeG4_NeC_6 -> 6.
| HaPC_NeG4_NeC_2 -> 2.
| HaPC_NeG2_NeC_4 -> 4.
| H0_NeG4_NeC_6 -> 6.
| H0_NeG4_NeC_2 -> 2.
| H0_NeG2_NeC_4 -> 4.
in
let ne_a = match model with
| H0_NeG1 -> ne_g
......@@ -118,12 +134,14 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
| H0_NeG3 -> ne_g
| H0_NeG4 -> ne_g
| H0_NeG5 -> ne_g
| H0_NeG6 -> ne_g
| HaPCOC -> ne_g
| HaPC_NeG1-> ne_g
| HaPC_NeG2-> ne_g
| HaPC_NeG3-> ne_g
| HaPC_NeG4-> ne_g
| HaPC_NeG5-> ne_g
| HaPC_NeG6-> ne_g
| HaPC_NeG5_NeC_div2 -> ne_g
| HaPC_NeG5_NeC_x2 -> ne_g
| H0_NeG5_NeC_div2 -> ne_g
......@@ -136,6 +154,12 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
| HaPC_NeG4_NeC_1 -> ne_g
| H0_NeG1_NeC_4 -> ne_g
| H0_NeG4_NeC_1 -> ne_g
| HaPC_NeG4_NeC_6 -> ne_g
| HaPC_NeG4_NeC_2 -> ne_g
| HaPC_NeG2_NeC_4 -> ne_g
| H0_NeG4_NeC_6 -> ne_g
| H0_NeG4_NeC_2 -> ne_g
| H0_NeG2_NeC_4 -> ne_g
in
let profile_f = profile.profile_f in
let profile_c = profile.profile_c in
......@@ -160,48 +184,24 @@ let derive_from_tree ~tree_dir ~tree ~profile ~preview ~use_concat ~ns ~no_Ne ~n
let indel_HaPC_NeG5 = Dataset.add_indels_to_dataset dataset_HaPC_NeG5 ~seed:(Random.int Int.max_value) in
(* let dataset_basis_hyps = [dataset_H0_NeG5; dataset_HaPCOC; dataset_HaPC_NeG5] in *)
let models = Convergence_hypothesis.[
[
H0_NeG1 ;
HaPC_NeG1;
(*H0_NeG5 ;
HaPC_NeG5;
HaPCOC ; calculated above in dataset_* *)
[ H0_NeG4 ;
HaPC_NeG4;
];
if preview then
[]
else
[
[(*H0_NeG3 ;HaPC_NeG3; *)
H0_NeG4;
HaPC_NeG4;
H0_NeG2;
HaPC_NeG2;
]
;
(if no_Ne then
[]
else
[(*HaPC_NeG5_NeC_div2 ;
HaPC_NeG5_NeC_x2 ;
H0_NeG5_NeC_div2 ;
H0_NeG5_NeC_x2 ;
HaPC_NeG1_NeC_5 ;
HaPC_NeG5_NeC_1 ;
H0_NeG1_NeC_5 ;
H0_NeG5_NeC_1 ;*)
HaPC_NeG1_NeC_4 ;
HaPC_NeG4_NeC_1 ;
H0_NeG1_NeC_4 ;
H0_NeG4_NeC_1 ;
]
);
(if ne_test then
[
]
else
[]
)
] |> List.concat
H0_NeG6;
HaPC_NeG6;
H0_NeG2;
HaPC_NeG2;
HaPC_NeG4_NeC_6 ;
HaPC_NeG4_NeC_2 ;
HaPC_NeG2_NeC_4 ;
H0_NeG4_NeC_6 ;
H0_NeG4_NeC_2 ;
H0_NeG2_NeC_4 ;
]
] |> List.concat
in
let dataset_per_hypo = List.map models ~f:(fun model ->
......
......@@ -73,8 +73,8 @@ let build_cmd_t_choices (opt_name : string) mr_option =
| None -> []
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
~h0_NeG1_mr ~h0_NeG2_mr ~h0_NeG3_mr ~h0_NeG4_mr ~h0_NeG5_mr ~h0_NeG6_mr
~haPC_NeG1_mr ~haPC_NeG2_mr ~haPC_NeG3_mr ~haPC_NeG4_mr ~haPC_NeG5_mr ~haPC_NeG6_mr
~haPC_NeG5_NeC_div2_mr
~haPC_NeG5_NeC_x2_mr
~h0_NeG5_NeC_div2_mr
......@@ -88,6 +88,12 @@ let make_t_choices ?(tree_prefix="") ~haPCOC_mr
~haPC_NeG1_NeC_4_mr
~h0_NeG1_NeC_4_mr
~h0_NeG4_NeC_1_mr
~haPC_NeG4_NeC_6_mr
~haPC_NeG4_NeC_2_mr
~haPC_NeG2_NeC_4_mr
~h0_NeG4_NeC_6_mr
~h0_NeG4_NeC_2_mr
~h0_NeG2_NeC_4_mr
~haPC_NeG5_indel_mr () : post_analyses_dir directory workflow =
let env = Env.env_r in
......@@ -98,11 +104,13 @@ let make_t_choices ?(tree_prefix="") ~haPCOC_mr
("--H0_NeG3" , h0_NeG3_mr );
("--H0_NeG4" , h0_NeG4_mr );
("--H0_NeG5" , h0_NeG5_mr );
("--H0_NeG6" , h0_NeG6_mr );
("--HaPC_NeG1" , haPC_NeG1_mr );
("--HaPC_NeG2" , haPC_NeG2_mr );
("--HaPC_NeG3" , haPC_NeG3_mr );
("--HaPC_NeG4" , haPC_NeG4_mr );
("--HaPC_NeG5" , haPC_NeG5_mr );
("--HaPC_NeG6" , haPC_NeG6_mr );
("--HaPC_NeG5_NeC_div2_res" , haPC_NeG5_NeC_div2_mr );
("--HaPC_NeG5_NeC_x2_res" , haPC_NeG5_NeC_x2_mr );
("--H0_NeG5_NeC_div2_res" , h0_NeG5_NeC_div2_mr );
......@@ -118,6 +126,13 @@ let make_t_choices ?(tree_prefix="") ~haPCOC_mr
("--H0_NeG5_indel_res" , h0_NeG5_indel_mr);
("--HaPC_NeG5_indel_res" , haPC_NeG5_indel_mr );
("--HaPCOC" , haPCOC_mr );
("--HaPC_NeG4_NeC_6_res" , haPC_NeG4_NeC_6_mr );
("--HaPC_NeG4_NeC_2_res" , haPC_NeG4_NeC_2_mr );
("--HaPC_NeG2_NeC_4_res" , haPC_NeG2_NeC_4_mr );
("--H0_NeG4_NeC_6_res" , h0_NeG4_NeC_6_mr );
("--H0_NeG4_NeC_2_res" , h0_NeG4_NeC_2_mr );
("--H0_NeG2_NeC_4_res" , h0_NeG2_NeC_4_mr );
] ~f:(fun (opt_name, mr_option) -> build_cmd_t_choices opt_name mr_option)
|> List.concat in
workflow ~descr:("post_analyses.t_choices." ^ tree_prefix) [
......@@ -210,11 +225,13 @@ type res_all_hyp = {
h0_NeG3_res : dataset_res option ;
h0_NeG4_res : dataset_res option ;
h0_NeG5_res : dataset_res option ;
h0_NeG6_res : dataset_res option ;
haPC_NeG1_res : dataset_res option ;
haPC_NeG2_res : dataset_res option ;
haPC_NeG3_res : dataset_res option ;
haPC_NeG4_res : dataset_res option ;
haPC_NeG5_res : dataset_res option ;
haPC_NeG6_res : dataset_res option ;
haPC_NeG5_NeC_div2_res : dataset_res option ;
haPC_NeG5_NeC_x2_res : dataset_res option ;
h0_NeG5_NeC_div2_res : dataset_res option ;
......@@ -230,17 +247,24 @@ type res_all_hyp = {
h0_NeG5_NeC_1_res : dataset_res option ;
h0_NeG1_NeC_5_res : dataset_res option ;
haPC_NeG4_NeC_6_res : dataset_res option ;
haPC_NeG4_NeC_2_res : dataset_res option ;
haPC_NeG2_NeC_4_res : dataset_res option ;
h0_NeG4_NeC_6_res : dataset_res option ;
h0_NeG4_NeC_2_res : dataset_res option ;
h0_NeG2_NeC_4_res : dataset_res option ;
h0_NeG5_indel_res : dataset_res option ;
haPC_NeG5_indel_res : dataset_res option ;
}
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;
h0_NeG1_res; h0_NeG2_res; h0_NeG3_res; h0_NeG4_res; h0_NeG5_res; h0_NeG6_res;
haPC_NeG1_res;
haPC_NeG2_res;
haPC_NeG3_res;
haPC_NeG4_res;
haPC_NeG5_res;
haPC_NeG5_res; haPC_NeG6_res;
haPC_NeG5_NeC_div2_res;
haPC_NeG5_NeC_x2_res ;
h0_NeG5_NeC_div2_res ;
......@@ -251,6 +275,12 @@ let make_t_choices_per_couple ~tree_prefix {ha_PCOC_res;
h0_NeG1_NeC_4_res ;
haPC_NeG5_NeC_1_res;
haPC_NeG1_NeC_5_res ;
h0_NeG4_NeC_6_res ;
h0_NeG4_NeC_2_res ;
h0_NeG2_NeC_4_res ;
haPC_NeG4_NeC_6_res;
haPC_NeG4_NeC_2_res;
haPC_NeG2_NeC_4_res ;
h0_NeG5_NeC_1_res ;
h0_NeG1_NeC_5_res ;
h0_NeG5_indel_res;
......@@ -264,11 +294,13 @@ let make_t_choices_per_couple ~tree_prefix {ha_PCOC_res;
let h0_NeG3_mr = get_merged_results_opt h0_NeG3_res in
let h0_NeG4_mr = get_merged_results_opt h0_NeG4_res in
let h0_NeG5_mr = get_merged_results_opt h0_NeG5_res in
let h0_NeG6_mr = get_merged_results_opt h0_NeG6_res in
let haPC_NeG1_mr = get_merged_results_opt haPC_NeG1_res in
let haPC_NeG2_mr = get_merged_results_opt haPC_NeG2_res in
let haPC_NeG3_mr = get_merged_results_opt haPC_NeG3_res in
let haPC_NeG4_mr = get_merged_results_opt haPC_NeG4_res in
let haPC_NeG5_mr = get_merged_results_opt haPC_NeG5_res in
let haPC_NeG6_mr = get_merged_results_opt haPC_NeG6_res in
let haPC_NeG5_NeC_div2_mr = get_merged_results_opt haPC_NeG5_NeC_div2_res in
let haPC_NeG5_NeC_x2_mr = get_merged_results_opt haPC_NeG5_NeC_x2_res in
......@@ -285,6 +317,13 @@ let make_t_choices_per_couple ~tree_prefix {ha_PCOC_res;
let h0_NeG1_NeC_5_mr = get_merged_results_opt h0_NeG1_NeC_5_res in
let h0_NeG5_NeC_1_mr = get_merged_results_opt h0_NeG5_NeC_1_res in
let haPC_NeG4_NeC_6_mr = get_merged_results_opt haPC_NeG4_NeC_6_res in
let haPC_NeG4_NeC_2_mr = get_merged_results_opt haPC_NeG4_NeC_2_res in
let haPC_NeG2_NeC_4_mr = get_merged_results_opt haPC_NeG2_NeC_4_res in
let h0_NeG4_NeC_6_mr = get_merged_results_opt h0_NeG4_NeC_6_res in
let h0_NeG4_NeC_2_mr = get_merged_results_opt h0_NeG4_NeC_2_res in
let h0_NeG2_NeC_4_mr = get_merged_results_opt h0_NeG2_NeC_4_res in
let h0_NeG5_indel_mr = get_merged_results_opt h0_NeG5_indel_res in
let haPC_NeG5_indel_mr = get_merged_results_opt haPC_NeG5_indel_res in
......@@ -293,12 +332,14 @@ let make_t_choices_per_couple ~tree_prefix {ha_PCOC_res;
~h0_NeG2_mr
~h0_NeG3_mr
~h0_NeG4_mr
~h0_NeG5_mr
~h0_NeG5_mr
~h0_NeG6_mr
~haPC_NeG1_mr
~haPC_NeG2_mr
~haPC_NeG3_mr
~haPC_NeG4_mr
~haPC_NeG5_mr
~haPC_NeG6_mr
~haPC_NeG5_NeC_div2_mr
~haPC_NeG5_NeC_x2_mr
~h0_NeG5_NeC_div2_mr
......@@ -311,6 +352,12 @@ let make_t_choices_per_couple ~tree_prefix {ha_PCOC_res;
~h0_NeG4_NeC_1_mr
~haPC_NeG5_NeC_1_mr
~haPC_NeG1_NeC_5_mr
~h0_NeG4_NeC_6_mr
~h0_NeG4_NeC_2_mr
~h0_NeG2_NeC_4_mr
~haPC_NeG4_NeC_6_mr
~haPC_NeG4_NeC_2_mr
~haPC_NeG2_NeC_4_mr
~h0_NeG1_NeC_5_mr
~h0_NeG5_NeC_1_mr
()
......@@ -325,11 +372,13 @@ let get_t_choices ~tree_prefix ~(dataset_results_l: dataset_res list) : t_choice
let h0_NeG3_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG3" ) in
let h0_NeG4_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG4" ) in
let h0_NeG5_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG5" ) in
let h0_NeG6_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG6" ) in
let haPC_NeG1_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG1" ) in
let haPC_NeG2_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG2" ) in
let haPC_NeG3_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG3" ) in
let haPC_NeG4_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG4" ) in
let haPC_NeG5_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG5" ) in
let haPC_NeG6_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG6" ) in
let haPC_NeG5_NeC_div2_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG5_NeC_div2" ) in
let haPC_NeG5_NeC_x2_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG5_NeC_x2" ) in
......@@ -346,18 +395,26 @@ let get_t_choices ~tree_prefix ~(dataset_results_l: dataset_res list) : t_choice
let h0_NeG5_NeC_1_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG5_NeC_1" ) in
let h0_NeG1_NeC_5_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG1_NeC_5" ) in
let haPC_NeG4_NeC_6_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG4_NeC_6" ) in
let haPC_NeG4_NeC_2_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG4_NeC_2" ) in
let haPC_NeG2_NeC_4_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG2_NeC_4" ) in
let h0_NeG4_NeC_6_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG4_NeC_6" ) in
let h0_NeG4_NeC_2_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG4_NeC_2" ) in
let h0_NeG2_NeC_4_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG2_NeC_4" ) in
let h0_NeG5_indel_res = List.find dataset_results_l (is_hyp ~hyp: "H0_NeG5_0.33_i" ) in
let haPC_NeG5_indel_res = List.find dataset_results_l (is_hyp ~hyp: "HaPC_NeG5_0.33_i" ) in
match (h0_NeG1_res) with
| ( Some h0_NeG1) ->
match (h0_NeG4_res) with
| ( Some h0_NeG4) ->
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;
h0_NeG1_res; h0_NeG2_res; h0_NeG3_res; h0_NeG4_res; h0_NeG5_res; h0_NeG6_res;
haPC_NeG1_res; haPC_NeG2_res;haPC_NeG3_res; haPC_NeG4_res; haPC_NeG5_res; haPC_NeG6_res;
haPC_NeG5_NeC_div2_res; haPC_NeG5_NeC_x2_res; h0_NeG5_NeC_div2_res; h0_NeG5_NeC_x2_res;
haPC_NeG4_NeC_1_res; haPC_NeG1_NeC_4_res; h0_NeG1_NeC_4_res; h0_NeG4_NeC_1_res;
haPC_NeG5_NeC_1_res; haPC_NeG1_NeC_5_res; h0_NeG1_NeC_5_res; h0_NeG5_NeC_1_res;
haPC_NeG4_NeC_6_res; haPC_NeG4_NeC_2_res; haPC_NeG2_NeC_4_res; h0_NeG4_NeC_6_res; h0_NeG4_NeC_2_res;h0_NeG2_NeC_4_res;
h0_NeG5_indel_res;haPC_NeG5_indel_res} in
let t_choices_max = t_choices_dir / selector ["out.max_MCC_per_meth.tsv"] in
let t_choices_recall09 = t_choices_dir / selector ["out.recall09_per_meth.tsv"] in
......@@ -367,7 +424,7 @@ let get_t_choices ~tree_prefix ~(dataset_results_l: dataset_res list) : t_choice
let t_choices_condensed_plot_png = t_choices_dir / selector ["out_condensed.png"] in
let rp_plot = t_choices_dir / selector ["out_condensed.recall_precision_ok.pdf"] in
let auc_tsv = t_choices_dir / selector ["out.auc_condensed.tsv"] in
let tree_prefix = h0_NeG1.tree_prefix in
let tree_prefix = h0_NeG4.tree_prefix in
Some {t_choices_max; t_choices_recall09; t_choices_complete ; t_choices_plot; t_choices_condensed_plot;t_choices_condensed_plot_png;rp_plot; auc_tsv; tree_prefix}
| _ -> None
......
......@@ -22,24 +22,32 @@ let nodes dataset (model : Convergence_hypothesis.t) =
|H0_NeG3 -> [ "tree.H0.node_ids" ]
|H0_NeG4 -> [ "tree.H0.node_ids" ]
|H0_NeG5 -> [ "tree.H0.node_ids" ]
|H0_NeG6 -> [ "tree.H0.node_ids" ]
|HaPC_NeG1-> [ "tree.Ha.node_ids" ]
|HaPC_NeG2-> [ "tree.Ha.node_ids" ]
|HaPC_NeG3-> [ "tree.Ha.node_ids" ]
|HaPC_NeG4-> [ "tree.Ha.node_ids" ]
|HaPC_NeG5-> [ "tree.Ha.node_ids" ]
|HaPC_NeG6-> [ "tree.Ha.node_ids" ]
|HaPC_NeG5_NeC_div2 -> [ "tree.Ha.node_ids" ]
|HaPC_NeG5_NeC_x2 -> [ "tree.Ha.node_ids" ]
|H0_NeG5_NeC_div2 -> [ "tree.H0_a.node_ids" ]
|H0_NeG5_NeC_x2 -> [ "tree.H0_a.node_ids" ]
|HaPCOC -> [ "tree.Ha.node_ids" ]
|HaPCOC -> [ "tree.Ha.node_ids" ]
|HaPC_NeG1_NeC_5 -> [ "tree.Ha.node_ids" ]
|HaPC_NeG5_NeC_1 -> [ "tree.Ha.node_ids" ]
|H0_NeG1_NeC_5 -> [ "tree.H0_a.node_ids" ]
|H0_NeG5_NeC_1 -> [ "tree.H0_a.node_ids" ]
|HaPC_NeG5_NeC_1 -> [ "tree.Ha.node_ids" ]
|H0_NeG1_NeC_5 -> [ "tree.H0_a.node_ids" ]
|H0_NeG5_NeC_1 -> [ "tree.H0_a.node_ids" ]
|HaPC_NeG1_NeC_4 -> [ "tree.Ha.node_ids" ]
|HaPC_NeG4_NeC_1 -> [ "tree.Ha.node_ids" ]
|H0_NeG1_NeC_4 -> [ "tree.H0_a.node_ids" ]
|H0_NeG4_NeC_1 -> [ "tree.H0_a.node_ids" ]
|HaPC_NeG4_NeC_6 -> [ "tree.Ha.node_ids" ]
|HaPC_NeG4_NeC_2 -> [ "tree.Ha.node_ids" ]
|HaPC_NeG2_NeC_4 -> [ "tree.Ha.node_ids" ]
|H0_NeG4_NeC_6 -> [ "tree.H0_a.node_ids" ]
|H0_NeG4_NeC_2 -> [ "tree.H0_a.node_ids" ]
|H0_NeG2_NeC_4 -> [ "tree.H0_a.node_ids" ]
)
let tree dataset mode =
......
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