error "Dependency cycle" to be fixed:

Dependency cycle between modules in _build/default/lib:
   -> Tree_dataset
-> File_formats
-> Convergence_detection
-> File_formats

lib/convergence_detection.mli

+open Core
 open Bistro.EDSL
 open Bistro.Std
-open Core
-open File_formats
 open Bistro_bioinfo.Std
+open File_formats
 
 type pcoc_out
 type diffsel_out

lib/file_formats.ml

@@ -75,9 +75,14 @@ type 'a w_det_meth =
   | Pcoc_gamma_w of 'a
   | Diffsel of 'a
 
-type 'a det_result = {
+type det_result = {
   dataset : dataset ;
   det_meth : det_meth ;
-  det_result : 'a workflow
+  det_result : Convergence_detection.det_out ;
+  }
+
+type dataset_res = {
+  res_by_tools: det_result list ;
+  merged_results : string
   }
 

lib/pipeline.ml

@@ -87,7 +87,8 @@ let derive_sim ~tree_dir ~trees ~profile_fn ~preview =
   |> List.concat
 
 
-let repo_of_det_results_l ~det_results_l =
+let repo_of_dataset_results_l ~dataset_results_l =
+  let det_results_l = dataset_results_l.res_by_tools in
   List.map det_results_l ~f:(fun det_results ->
     let model_prefix = det_results.dataset.model_prefix in
     let tree_prefix = det_results.dataset.tree_prefix in
@@ -130,14 +131,15 @@ let derive_from_det_meth ~det_meth ~dataset ~preview =
 
 let derive_from_dataset ~dataset ~preview=
   let det_meths = [Pcoc;Pcoc_gamma;Diffsel] in
-  List.map det_meths ~f:(fun det_meth ->
+  let res_by_tools = List.map det_meths ~f:(fun det_meth ->
     derive_from_det_meth ~det_meth ~dataset ~preview
-    )
+    ) in
+  let merged_results = "" (* TODO: replace "" by a workflow *) in
+  {res_by_tools; merged_results}
 
 let derive_det ~dataset_l ~profile_fn ~preview=
   List.map dataset_l ~f:(fun dataset ->
       derive_from_dataset ~preview ~dataset)
-  |> List.concat
 
 let main ~outdir ?(np = 2) ?(mem = 2) ~tree_dir ~profile_fn ~preview () =
  let logger =
@@ -147,10 +149,10 @@ let main ~outdir ?(np = 2) ?(mem = 2) ~tree_dir ~profile_fn ~preview () =
     ] in
   let trees = Array.to_list @@ Sys.readdir tree_dir in
   let dataset_l = derive_sim ~tree_dir ~trees ~profile_fn ~preview in
-  let det_results_l = derive_det ~dataset_l ~profile_fn ~preview in
+  let dataset_results_l = derive_det ~dataset_l ~profile_fn ~preview in
   let repo = [
     repo_of_dataset_l dataset_l ~preview  ;
-    repo_of_det_results_l det_results_l;
+    repo_of_dataset_results_l dataset_results_l;
   ]
   |> List.concat
   in