Commit 29f00885 authored by Carine Rey's avatar Carine Rey Committed by Philippe Veber
Browse files

add pcoc with max_gap_allowed

parent bc1d0938
......@@ -202,9 +202,9 @@ let derive_from_det_meth ~det_meth ~(dataset : Dataset.t) ~preview =
let n_cycles = if preview then 2000 else 2000 in
let seed = Hashtbl.hash dataset.seed in
match det_meth with
| `Pcoc -> `Pcoc (Pcoc.pcoc ~descr ~catx_est:10 ~plot_complete:false ~gamma:false ~faa ~tree:tree_sc)
| `Pcoc_gamma -> `Pcoc_gamma (Pcoc.pcoc ~descr ~catx_est:10 ~plot_complete: false ~gamma:true ~faa ~tree:tree_sc)
| `Pcoc_C60 -> `Pcoc_C60 (Pcoc.pcoc ~descr ~catx_est:60 ~plot_complete: false ~gamma:false ~faa ~tree:tree_sc)
| `Pcoc -> `Pcoc (Pcoc.pcoc ~descr ~catx_est:10 ~max_gap_per_conv_leaf:25 ~max_gap_per_pos:25 ~plot_complete:false ~gamma:false ~faa ~tree:tree_sc ())
| `Pcoc_gamma -> `Pcoc_gamma (Pcoc.pcoc ~descr ~catx_est:10 ~max_gap_per_conv_leaf:25 ~max_gap_per_pos:25 ~plot_complete: false ~gamma:true ~faa ~tree:tree_sc ())
| `Pcoc_C60 -> `Pcoc_C60 (Pcoc.pcoc ~descr ~catx_est:60 ~plot_complete: false ~gamma:false ~faa ~tree:tree_sc ())
| `Tdg09 -> `Tdg09 (Tamuri.tdg09 ~descr ~faa ~tree:tree_sc)
| `Diffsel -> `Diffsel (Diffsel.diffsel ~descr ~phy_n ~tree:diffsel_tree ~w_every ~n_cycles ~id:1 ~seed ())
| `Identical_LG -> `Identical_LG (Identical.identical ~descr ~faa ~tree_id ~tree_sc ~prot_model:"LG08")
......@@ -222,6 +222,7 @@ let derive_from_dataset ~dataset ~preview ~use_diffsel ~use_c60=
`Topological_LG;
`Multinomial;
`Pcoc;
`Pcoc_gamma;
] @ List.map [0.05] ~f:(fun x -> `Msd x)) ;
(* if preview then *)
[`Tdg09;]
......
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