add a second diffsel chain

lib/convergence_detection.ml

@@ -9,12 +9,14 @@ type result = [
   | `Pcoc of [`pcoc] directory workflow
   | `Pcoc_gamma of [`pcoc] directory workflow
   | `Diffsel of [`diffsel] directory workflow
+  | `Diffsel_bis of [`diffsel] directory workflow
 ]
 
 let meth_string_of_result = function
   | `Pcoc _ -> "pcoc"
   | `Pcoc_gamma _ -> "pcoc_gamma"
   | `Diffsel _ -> "diffsel"
+  | `Diffsel_bis _ -> "diffsel_bis"
 
 type dataset_res = {
   model_prefix : string ;
@@ -31,11 +33,13 @@ let merge_results ~res_by_tools : text_file workflow =
         | `Pcoc d
         | `Pcoc_gamma d -> Pcoc.results d
         | `Diffsel d -> Diffsel.selector d
+        | `Diffsel_bis d -> Diffsel.selector d
       in
       let opt = match res with
         | `Pcoc _ -> string "--pcoc"
         | `Pcoc_gamma _ -> string "--pcoc_gamma"
         | `Diffsel _ -> string "--diffsel"
+        | `Diffsel_bis _ -> string "--diffsel_bis"
       in
       seq ~sep:" " [opt; dep w]
     )
@@ -59,6 +63,7 @@ let plot_merge_results ~res_by_tools ~tree ~faa ~tsv : svg workflow =
       | `Pcoc _ -> "PCOC"
       | `Pcoc_gamma _ -> "PCOC_gamma"
       | `Diffsel _ -> "Diffsel"
+      | `Diffsel_bis _ -> "Diffsel_bis"
     in
     string opt
   ) |> seq ~sep:","
@@ -68,6 +73,7 @@ let plot_merge_results ~res_by_tools ~tree ~faa ~tsv : svg workflow =
       | `Pcoc _ -> "PCOC:0.99"
       | `Pcoc_gamma _ -> "PCOC_gamma:0.99"
       | `Diffsel _ -> "Diffsel:0.9"
+      | `Diffsel_bis _ -> "Diffsel_bis:0.9"
     in
     string opt
   ) |> seq ~sep:","

lib/convergence_detection.mli

@@ -10,6 +10,7 @@ type result = [
   | `Pcoc of [`pcoc] directory workflow
   | `Pcoc_gamma of [`pcoc] directory workflow
   | `Diffsel of [`diffsel] directory workflow
+  | `Diffsel_bis of [`diffsel] directory workflow
 ]
 
 val meth_string_of_result : result -> string

lib/pipeline.ml

@@ -48,12 +48,14 @@ let repo_of_detection_result res =
       | `Pcoc w -> item ["pcoc.results.tsv"] (Pcoc.results w)
       | `Pcoc_gamma w -> item ["pcoc_gamma.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)
     ) ;
     (
       match res with
       | `Pcoc w -> item ["raw_results"]  w
       | `Pcoc_gamma w -> item ["raw_results"] w
       | `Diffsel w -> item ["raw_results"] w
+      | `Diffsel_bis w -> item ["raw_results"] w
     ) ;
   ]
   |> Repo.shift det_meth_prefix
@@ -89,12 +91,13 @@ let derive_from_det_meth ~det_meth ~(dataset : Dataset.t) ~preview =
     | `Pcoc -> `Pcoc (Pcoc.pcoc ~plot_complete:true ~gamma:false ~faa ~tree:pcoc_tree)
     | `Pcoc_gamma -> `Pcoc_gamma (Pcoc.pcoc ~plot_complete: true ~gamma:true ~faa ~tree:pcoc_tree)
     | `Diffsel -> `Diffsel (Diffsel.diffsel ~phy_n ~tree:diffsel_tree ~w_every ~n_cycles)
+    | `Diffsel_bis -> `Diffsel_bis (Diffsel.diffsel ~phy_n ~tree:diffsel_tree ~w_every ~n_cycles)
 
 
 
 
 let derive_from_dataset ~dataset ~preview =
-  let det_meths = [`Pcoc;`Pcoc_gamma;`Diffsel] in
+  let det_meths = [`Pcoc;`Pcoc_gamma;`Diffsel;`Diffsel_bis] in
   let res_by_tools = List.map det_meths ~f:(fun det_meth ->
     derive_from_det_meth ~det_meth ~dataset ~preview
     ) in

lib/scripts/merge_det_results.py

@@ -56,6 +56,8 @@ availableOptions.add_argument('--pcoc_gamma', type=str,
                    help="Pcoc_gamma output name", default = None)
 availableOptions.add_argument('--diffsel', type=str,
                    help="Diffsel output name", default = None)
+availableOptions.add_argument('--diffsel_bis', type=str,
+                   help="Diffsel_bis output name", default = None)
 
 ##############
 
@@ -66,6 +68,7 @@ args = parser.parse_args()
 df_pcoc = pd.DataFrame()
 df_pcoc_gamma = pd.DataFrame()
 df_diffsel = pd.DataFrame()
+df_diffsel_bis = pd.DataFrame()
 
 OutName = args.output
 if args.pcoc :
@@ -77,6 +80,11 @@ if args.pcoc_gamma :
   df_pcoc_gamma.rename(columns={'PCOC': 'PCOC_gamma',
                                 'PC': 'PC_gamma',
                                 'OC': 'OC_gamma'}, inplace=True)
+if args.diffsel_bis :
+  df_diffsel_bis = pd.read_csv(args.diffsel_bis, sep="\t")
+  df_diffsel_bis = df_diffsel_bis[['Sites','Diffsel']]
+  df_diffsel_bis.rename(columns={'Diffsel': 'Diffsel_bis'}, inplace=True)
+  df_diffsel_bis["Sites"] = df_diffsel_bis["Sites"]+1
 
 
 if args.pcoc_gamma :
@@ -84,7 +92,7 @@ if args.pcoc_gamma :
   df_diffsel["Sites"] = df_diffsel["Sites"]+1
 
 
-df_list = [df for df in [df_pcoc, df_pcoc_gamma, df_diffsel] if not df.empty ]
+df_list = [df for df in [df_pcoc, df_pcoc_gamma, df_diffsel, df_diffsel_bis] if not df.empty ]
 
 df_final = reduce(lambda x, y: pd.merge(x, y, on = 'Sites', how='outer'), df_list)