add plot dist

lib/scripts/calc_t_per_meth.R

@@ -302,7 +302,7 @@ print(df_recall_sup09_per_meth)
 plot_out = function(df_out, df_d , df_recall_sup09_per_meth, meths = NULL, suffix="") {
 
     nb_c = length(unique(df_out$couple))
-    colors = c(c("#984EA3","#4AA947","#377EB8","#E41A1C","#F5BE5B","#90EE90","#8B6914")[1:nb_c], c("#7F7F7F","#ADD8E6"))
+    colors = c(c("#984EA3","#4AA947","#377EB8","#E41A1C","#F5BE5B","#90EE90","#8B6914","#BFBFBF")[1:nb_c], c("#7F7F7F","#ADD8E6"))
     colors2 = c("#984EA3","#4AA947","#377EB8","#E41A1C","#F5BE5B","#90EE90","#8B6914","#7F7F7F","#ADD8E6")
 
     if (! is.null(meths)) {
@@ -587,8 +587,7 @@ plot_out = function(df_out, df_d , df_recall_sup09_per_meth, meths = NULL, suffi
     limitsize = FALSE
     )
 
-
-    if ( all((df_out_melt) %in% c("P_JSD","P_ED", "C1", "C2", "entropy_C1","entropy_C2"))){
+    if ( all( c("P_JSD","P_ED", "C1", "C2", "entropy_C1","entropy_C2") %in% colnames(df_d))){
 
         print("plot value/distance")
 
@@ -672,17 +671,20 @@ plot_out = function(df_out, df_d , df_recall_sup09_per_meth, meths = NULL, suffi
                   limitsize = FALSE
                   )
 
-    #plot = plot_grid(plot_recall_precision,plot_max_MCC,plot_value_JSD,plot_value_ED,plot_entropy_C2_C1,plot_entropy_C1,plot_entropy_C2,
-    #                 labels = c("A", "B","C","D","E","F"),
-    #                 rel_heights = c(length(unique(df_out$couple))*0.8,3,length(unique(df_out$couple))*0.8,length(unique(df_out$couple))*0.8,length(unique(df_out$couple))*0.8,length(unique(df_out$couple))*0.8,length(unique(df_out$couple))*0.8),
-    #                 nrow=7
-    #                 )
+
     }
-    plot = plot_grid(plot_recall_precision,plot_recall_precision_papier,plot_max_MCC,plot_FPR,plot_FPR2,
-                    labels = c("A", "A'", "B","B'","B''"),
-                    rel_heights = c(length(unique(df_out$couple))*0.8,2,4,2,2),
-                    nrow=5
+    
+    plot = plot_grid(plot_recall_precision,plot_max_MCC,plot_value_JSD,plot_value_ED,plot_entropy_C2_C1,plot_entropy_C1,plot_entropy_C2,
+                     labels = c("A", "B","C","D","E","F"),
+                     rel_heights = c(length(unique(df_out$couple))*0.8,3,length(unique(df_out$couple))*0.8,length(unique(df_out$couple))*0.8,length(unique(df_out$couple))*0.8,length(unique(df_out$couple))*0.8,length(unique(df_out$couple))*0.8),
+                     nrow=7
                      )
+    
+    #plot = plot_grid(plot_recall_precision,plot_recall_precision_papier,plot_max_MCC,plot_FPR,plot_FPR2,
+    #                labels = c("A", "A'", "B","B'","B''"),
+    #                rel_heights = c(length(unique(df_out$couple))*0.8,2,4,2,2),
+    #                nrow=5
+    #                 )
 
     save_plot(paste0(opt$out,suffix,".pdf"),
               plot,