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

try different globale ne

parent b02a1cd1
......@@ -3,6 +3,16 @@ open Bistro.EDSL
open Bistro.Std
type t =
| H0_NeG1
| H0_NeG2
| H0_NeG3
| H0_NeG4
| H0_NeG5
| HaPC_NeG1
| HaPC_NeG2
| HaPC_NeG3
| HaPC_NeG4
| HaPC_NeG5
| H0
| HaPC
| HaPCOC
......@@ -19,6 +29,16 @@ type t =
| HaPC_NeBig
let string_of_model m = match m with
| H0_NeG1 -> "H0_NeG1"
| H0_NeG2 -> "H0_NeG2"
| H0_NeG3 -> "H0_NeG3"
| H0_NeG4 -> "H0_NeG4"
| H0_NeG5 -> "H0_NeG5"
| HaPC_NeG1 -> "HaPC_NeG1"
| HaPC_NeG2 -> "HaPC_NeG2"
| HaPC_NeG3 -> "HaPC_NeG3"
| HaPC_NeG4 -> "HaPC_NeG4"
| HaPC_NeG5 -> "HaPC_NeG5"
| H0 -> "H0"
| HaPC -> "HaPC"
| HaPCOC -> "HaPCOC"
......@@ -89,6 +109,16 @@ let bpp_config_F nodes hyp = [
string bpp_config_base ;
insert nodes ;
match hyp with
| H0_NeG1 -> bpp_config_H0_F_Ne
| H0_NeG2 -> bpp_config_H0_F_Ne
| H0_NeG3 -> bpp_config_H0_F_Ne
| H0_NeG4 -> bpp_config_H0_F_Ne
| H0_NeG5 -> 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
| H0 -> bpp_config_H0_F
| HaPC -> bpp_config_HaPC_F
| HaPCOC -> bpp_config_HaPCOC_F
......
......@@ -57,7 +57,30 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
*)
(* with several profiles or couples of profiles *)
let config_p = Convergence_hypothesis.bpp_config_F nodes model in
let ne_g = match model with
| H0_NeG1 -> 1.
| H0_NeG2 -> 2.
| H0_NeG3 -> 3.
| H0_NeG4 -> 4.
| H0_NeG5 -> 5.
| HaPC_NeG1-> 1.
| HaPC_NeG2-> 2.
| HaPC_NeG3-> 3.
| HaPC_NeG4-> 4.
| HaPC_NeG5-> 5.
| _ -> 1.
in
let ne_c = match model with
| H0_NeG1 -> ne_g
| H0_NeG2 -> ne_g
| H0_NeG3 -> ne_g
| H0_NeG4 -> ne_g
| H0_NeG5 -> ne_g
| HaPC_NeG1-> ne_g
| HaPC_NeG2-> ne_g
| HaPC_NeG3-> ne_g
| HaPC_NeG4-> ne_g
| HaPC_NeG5-> ne_g
| H0_NeVerySmall -> 0.001
| H0_NeSmall -> 0.1
| HaPCOC_NeSmall -> 0.1
......@@ -69,9 +92,20 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
| H0_SmallNeInBigNe -> 0.1
| HaPC_BigNeInSmallNe -> 10.
| HaPC_SmallNeInBigNe -> 0.1
| _ -> 1.
in
let ne_a = match model with
| H0_NeG1 -> ne_g
| H0_NeG2 -> ne_g
| H0_NeG3 -> ne_g
| H0_NeG4 -> ne_g
| H0_NeG5 -> ne_g
| HaPC_NeG1-> ne_g
| HaPC_NeG2-> ne_g
| HaPC_NeG3-> ne_g
| HaPC_NeG4-> ne_g
| HaPC_NeG5-> ne_g
| H0_BigNeInSmallNe -> 0.1
| H0_SmallNeInBigNe -> 10.
| HaPC_BigNeInSmallNe -> 0.1
......@@ -94,9 +128,17 @@ let derive_from_tree ~tree_dir ~tree ~profile ~preview ~use_concat ~ns ~no_Ne ~n
let tree_dataset = Tree_dataset.prepare input_tree in
let models = Convergence_hypothesis.[
[
H0 ;
HaPCOC ;
HaPC
H0_NeG1 ;
H0_NeG2 ;
H0_NeG3 ;
H0_NeG4 ;
H0_NeG5 ;
HaPC_NeG1;
HaPC_NeG2;
HaPC_NeG3;
HaPC_NeG4;
HaPC_NeG5;
HaPCOC ;
];
( if no_HaPC then
[]
......
......@@ -17,6 +17,16 @@ let prepare tree =
let nodes dataset (model : Convergence_hypothesis.t) =
dataset / selector (
match model with
|H0_NeG1 -> [ "tree.H0.node_ids" ]
|H0_NeG2 -> [ "tree.H0.node_ids" ]
|H0_NeG3 -> [ "tree.H0.node_ids" ]
|H0_NeG4 -> [ "tree.H0.node_ids" ]
|H0_NeG5 -> [ "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" ]
|H0 -> [ "tree.H0.node_ids" ]
|HaPC -> [ "tree.Ha.node_ids" ]
|HaPCOC -> [ "tree.Ha.node_ids" ]
......
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