plot mean and max for diffsel

lib/convergence_detection.ml

@@ -82,8 +82,8 @@ let plot_merge_results ~(res_by_tools:result list) ~tree ~faa ~tsv : svg workflo
     let opt = match res with
       | `Pcoc _ -> "PCOC,PC,OC"
       | `Pcoc_gamma _ -> "PCOC_gamma,PC_gamma,OC_gamma,"
-      | `Diffsel _ -> "Diffsel"
-      | `Diffsel_bis _ -> "Diffsel_bis"
+      | `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"
@@ -97,8 +97,8 @@ let plot_merge_results ~(res_by_tools:result list) ~tree ~faa ~tsv : svg workflo
     let opt = match res with
       | `Pcoc _ -> "PCOC:0.99"
       | `Pcoc_gamma _ -> "PCOC_gamma:0.99"
-      | `Diffsel _ -> "Diffsel:0.9"
-      | `Diffsel_bis _ -> "Diffsel_bis:0.9"
+      | `Diffsel _ -> "Diffsel_mean:0.9,Diffsel_max:0.9"
+      | `Diffsel_bis _ -> "Diffsel_bis_mean:0.9,Diffsel_bis_max:0.9"
       | `Identical_LG _ -> "Identical_LG08:0.9"
       | `Identical_WAG _ -> "Identical_WAG01:0.9"
       | `Topological_LG _ -> "Topological_LG08:0.9"

lib/scripts/diffsel_analyze_result.py

@@ -90,13 +90,14 @@ if rddata.shape[1] != 20:
     exit(1)
 MESSAGE("Computing maximum probability per site")
 rddata2 = 2 * abs(0.5 - rddata)
-maxes = rddata2.mean(axis=1)
+df = rddata2.max(axis=1).to_frame(name="Diffsel_max")
+df["Diffsel_mean"] = rddata2.mean(axis=1)
 
 #===================================================================================================
 print(step("Writing result to file"))
 
 MESSAGE("Output file is " + param(out))
-maxes.index.name="Sites"
-maxes.index = maxes.index + 1
-maxes.to_csv(out, sep='\t', header=["Diffsel"])
+df.index.name="Sites"
+df.index = df.index + 1
+df.to_csv(out, sep='\t')
 MESSAGE("Done :)")

lib/scripts/merge_det_results.py

@@ -97,8 +97,10 @@ if args.pcoc_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 = df_diffsel_bis[['Sites','Diffsel_mean','Diffsel_max']]
+  df_diffsel_bis.rename(columns={'Diffsel_mean': 'Diffsel_bis_mean',
+                                 'Diffsel_max': 'Diffsel_bis_max'
+                                 }, inplace=True)
 
 
 if args.diffsel :