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

Forceful removal of diffsel_bis

parent 25a6cc41
......@@ -10,7 +10,6 @@ type result = [
| `Pcoc_gamma of [`pcoc] directory workflow
| `Pcoc_C60 of [`pcoc] directory workflow
| `Diffsel of [`diffsel] directory workflow
| `Diffsel_bis of [`diffsel] directory workflow
| `Identical_LG of [`identical] directory workflow
| `Identical_WAG of [`identical] directory workflow
| `Topological_LG of [`topological] directory workflow
......@@ -24,7 +23,6 @@ let meth_string_of_result = function
| `Pcoc_gamma _ -> "pcoc_gamma"
| `Pcoc_C60 _ -> "pcoc_gamma"
| `Diffsel _ -> "diffsel"
| `Diffsel_bis _ -> "diffsel_bis"
| `Identical_LG _ -> "identical_LG"
| `Identical_WAG _ -> "identical_WAG"
| `Topological_LG _ -> "topological_LG"
......@@ -49,7 +47,6 @@ let merge_results ~res_by_tools : text_file workflow =
| `Pcoc_gamma d -> Pcoc.results d
| `Pcoc_C60 d -> Pcoc.results d
| `Diffsel d -> Diffsel.selector d
| `Diffsel_bis d -> Diffsel.selector d
| `Identical_LG d -> Identical.results d
| `Identical_WAG d -> Identical.results d
| `Topological_LG d -> Topological.results d
......@@ -62,7 +59,6 @@ let merge_results ~res_by_tools : text_file workflow =
| `Pcoc_gamma _ -> string "--pcoc_gamma"
| `Pcoc_C60 _ -> string "--pcoc_C60"
| `Diffsel _ -> string "--diffsel"
| `Diffsel_bis _ -> string "--diffsel_bis"
| `Identical_LG _ -> string "--identical_LG"
| `Identical_WAG _ -> string "--identical_WAG"
| `Topological_LG _ -> string "--topological_LG"
......@@ -90,7 +86,6 @@ let plot_merge_results ~plot_all_sites ~(res_by_tools:result list) ~tree ~faa ~t
| `Pcoc_gamma _ -> "PCOC_gamma,PC_gamma,OC_gamma,"
| `Pcoc_C60 _ -> "PCOC_C60,PC_C60,OC_C60,"
| `Diffsel _ -> "Diffsel_mean,Diffsel_max"
| `Diffsel_bis _ -> "Diffsel_bis_mean,Diffsel_bis_max"
| `Identical_LG _ -> "Identical_LG08"
| `Identical_WAG _ -> "Identical_WAG01"
| `Topological_LG _ -> "Topological_LG08"
......@@ -107,7 +102,6 @@ let plot_merge_results ~plot_all_sites ~(res_by_tools:result list) ~tree ~faa ~t
| `Pcoc_gamma _ -> "PCOC_gamma:0.99,PC_gamma:0.99,OC_gamma:0.99"
| `Pcoc_C60 _ -> "PCOC_C60:0.99,PC_C60:0.99,OC_C60:0.99"
| `Diffsel _ -> "Diffsel_mean:0.11,Diffsel_max:0.9"
| `Diffsel_bis _ -> "Diffsel_bis_mean:0.11,Diffsel_bis_max:0.9"
| `Identical_LG _ -> "Identical_LG08:0.9"
| `Identical_WAG _ -> "Identical_WAG01:0.9"
| `Topological_LG _ -> "Topological_LG08:0.9"
......
......@@ -10,7 +10,6 @@ type result = [
| `Pcoc_gamma of [`pcoc] directory workflow
| `Pcoc_C60 of [`pcoc] directory workflow
| `Diffsel of [`diffsel] directory workflow
| `Diffsel_bis of [`diffsel] directory workflow
| `Identical_LG of [`identical] directory workflow
| `Identical_WAG of [`identical] directory workflow
| `Topological_LG of [`topological] directory workflow
......
......@@ -133,7 +133,6 @@ let repo_of_detection_result res =
| `Pcoc_gamma w -> item ["pcoc_gamma.results.tsv"] (Pcoc.results w)
| `Pcoc_C60 w -> item ["pcoc_C60.results.tsv"] (Pcoc.results w)
| `Diffsel w -> item ["diffsel.results.tsv"] (Diffsel.selector w)
| `Diffsel_bis w -> item ["diffsel_bis.results.tsv"] (Diffsel.selector w)
| `Identical_LG w -> item ["Identical_LG.results.tsv"] (Identical.results w)
| `Identical_WAG w -> item ["Identical_WAG.results.tsv"] (Identical.results w)
| `Topological_LG w -> item ["Topological_LG.results.tsv"] (Topological.results w)
......@@ -147,7 +146,6 @@ let repo_of_detection_result res =
| `Pcoc_gamma w -> item ["raw_results"] w
| `Pcoc_C60 w -> item ["raw_results"] w
| `Diffsel w -> item ["raw_results"] w
| `Diffsel_bis w -> item ["raw_results"] w
| `Identical_LG w -> item ["raw_results"] w
| `Identical_WAG w -> item ["raw_results"] w
| `Topological_LG w -> item ["raw_results"] w
......@@ -195,7 +193,6 @@ let derive_from_det_meth ~det_meth ~(dataset : Dataset.t) ~preview =
| `Pcoc_C60 -> `Pcoc_gamma (Pcoc.pcoc ~catx_est:60 ~plot_complete: true ~gamma:false ~faa ~tree:tree_sc)
| `Tdg09 -> `Tdg09 (Tamuri.tdg09 ~faa ~tree:tree_sc)
| `Diffsel -> `Diffsel (Diffsel.diffsel ~phy_n ~tree:diffsel_tree ~w_every ~n_cycles ~id:1 ~tag:"v1.0" )
| `Diffsel_bis -> `Diffsel_bis (Diffsel.diffsel ~phy_n ~tree:diffsel_tree ~w_every ~n_cycles ~id:2 ~tag:"v1.0")
| `Identical_LG -> `Identical_LG (Identical.identical ~faa ~tree_id ~tree_sc ~prot_model:"LG08")
| `Identical_WAG -> `Identical_WAG (Identical.identical ~faa ~tree_id ~tree_sc ~prot_model:"WAG01")
| `Topological_LG -> `Topological_LG (Topological.topological ~faa ~tree:tree_id ~tree_conv ~prot_model:"LG08")
......@@ -221,7 +218,7 @@ let derive_from_dataset ~dataset ~preview ~fast_mode=
if fast_mode then
[]
else
[`Diffsel;`Diffsel_bis;`Pcoc_C60;] ;
[`Diffsel; `Pcoc_C60;] ;
]
|> List.concat in
let res_by_tools = List.map det_meths ~f:(fun det_meth ->
......
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