Commit d6693c27 authored by Carine Rey's avatar Carine Rey
Browse files

update hyps + figure

parent 9d0b0add
......@@ -90,11 +90,9 @@ let derive_from_tree ~tree_dir ~tree ~profile ~preview ~use_concat ~ns ~no_Ne ~n
(* let dataset_basis_hyps = [dataset_H0_NeG5; dataset_HaPCOC; dataset_HaPC_NeG5] in *)
let nes_list =
[Fixed 4.] @ if preview then [] else
[Fixed 1.; Fixed 8.; Fixed 16.; (* 4->8, 8->4, 8, 16, 1->8 and 16->1 are new ; it means 6*2*2 tasks on cyp/C4A *)
[Fixed 1.; Fixed 8.; (* 4->8, 8->4, 8, 16, 1->8 and 16->1 are new ; it means 6*2*2 tasks on cyp/C4A *)
Variable (1., 4.); Variable (4., 1.);
Variable (4., 8.); Variable (8., 4.);
Variable (16., 1.); Variable (1., 8.);
Variable (8., 1.);
Variable (4., 8.); Variable (8., 1.);
]
in
let models = h0_hapc_forall nes_list in
......
......@@ -666,6 +666,7 @@ plot_out = function(df_out, df_d , df_recall_sup09_per_meth, meths = NULL, suffi
plot = plot + facet_grid(couple ~ methode)
plot = plot + theme(axis.text.x = element_text(angle = 45, hjust = 1))
plot = plot + ggtitle(paste0("Tree: ", opt$tree_prefix , "\n Date: " , date ))
plot = plot + theme(strip.text.y = element_text(size=7))
plot_recall_precision = plot
......@@ -679,9 +680,9 @@ plot_out = function(df_out, df_d , df_recall_sup09_per_meth, meths = NULL, suffi
print("plot recall_precision")
couple_plot1 = c("H0/HaPC NeG1","H0/HaPC NeG4","H0/HaPC NeG8")
couple_plot2 = c("H0/H0 NeG4/NeG4_NeC_1","H0/H0 NeG4/NeG4_NeC_8","H0/H0 NeG1/NeG1_NeC_4")
couple_plot3 = c("H0/HaPC NeG4_NeC_8","H0/HaPC NeG4_NeC_1","H0/HaPC NeG1_NeC_4")
couple_plot4 = c("H0 NeG1/HaPC NeG1_NeC_4","H0 NeG4/HaPC NeG4_NeC_1","H0 NeG4/HaPC NeG4_NeC_8")
couple_plot2 = c("H0/H0 NeG8/NeG8_NeC_1","H0/H0 NeG4/NeG4_NeC_8","H0/H0 NeG1/NeG1_NeC_4")
couple_plot3 = c("H0/HaPC NeG4_NeC_8","H0/HaPC NeG8_NeC_1","H0/HaPC NeG1_NeC_4")
couple_plot4 = c("H0 NeG1/HaPC NeG1_NeC_4","H0 NeG8/HaPC NeG8_NeC_1","H0 NeG4/HaPC NeG4_NeC_8")
couple_i = c(couple_plot1,couple_plot2,couple_plot3,couple_plot4)
......@@ -736,7 +737,7 @@ plot_out = function(df_out, df_d , df_recall_sup09_per_meth, meths = NULL, suffi
plot_PR_c = function(couple_l) {
tmp_df = subset(df_out,couple%in%couple_l)
tmp_df$couple = factor( tmp_df$couple, levels=c(levels( tmp_df$couple),"to_be_rm","to_be_rm2","to_be_rm3"))
tmp_df$couple = factor( tmp_df$couple, levels=c(levels( tmp_df$couple),"to_be_rm","to_be_rm2","to_be_rm3","to_be_rm4"))
if ("NULL" %in% couple_l) {
tmp_df[dim(tmp_df)[1]+1,] = tmp_df[dim(tmp_df)[1],]
tmp_df$couple[dim(tmp_df)[1]] = "to_be_rm"
......@@ -749,6 +750,10 @@ plot_out = function(df_out, df_d , df_recall_sup09_per_meth, meths = NULL, suffi
tmp_df[dim(tmp_df)[1]+1,] = tmp_df[dim(tmp_df)[1],]
tmp_df$couple[dim(tmp_df)[1]] = "to_be_rm3"
}
if ("NULL4" %in% couple_l) {
tmp_df[dim(tmp_df)[1]+1,] = tmp_df[dim(tmp_df)[1],]
tmp_df$couple[dim(tmp_df)[1]] = "to_be_rm4"
}
from_m=c("PCOC","Mutinomial_1MinusLRT", "Msd_0.05_1MinusP", "Identical_LG08", "Tdg09_1MinusLRT","Topological_LG08","diffsel_mean")
to_m=c("PCOC","Mutinomial", "msd", "Identical", "TDG09","Topological","diffsel")
tmp_df$methode = mapvalues(tmp_df$methode, from=from_m, to=to_m)
......
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