diff --git a/ml/global.R b/ml/global.R index 7a9d312..9f4ff5a 100644 --- a/ml/global.R +++ b/ml/global.R @@ -46,7 +46,7 @@ split_map = data.frame( "_70_30_complete", "_80_20_complete", "_sl_complete", - "_none" + "_none_complete" ), splits=c( "cd_7030", @@ -75,7 +75,7 @@ for (x in gene) { #print(c(filename)) #load_name=paste0(combo[gene==x,"drug"],'_',split_map['splits'][split_map['files']==split]) load_name=paste0(x,'_baselineC_',split_map['splits'][split_map['files']==split]) - #print(load_name) + print(load_name) # try() on its own is fine here because we don't need to do anything if it fails try({loaded_files[[load_name]] = read.csv(filename)}) } @@ -120,7 +120,7 @@ makeplot = function(x, # the DataFrame to plot y_coord_min = 0 } if (display_infobox) { - metadata=t(plot_data[1,metadata_cols]) + metadata=t(plot_data[1,colnames(plot_data)[colnames(plot_data) %in% metadata_cols]]) if (display_combined){ metatext=paste0("Train/Test: ", metadata[1], "/", metadata[2], @@ -159,8 +159,8 @@ makeplot = function(x, # the DataFrame to plot , position=position_dodge2(padding=0.1, preserve='total', reverse=TRUE) ) + coord_cartesian(ylim = c(y_coord_min, 1)) + - scale_fill_manual(values = c("BT" = "#605ca8", - "CV" = "#bebddb") ) + + #scale_fill_manual(values = c("BT" = "#605ca8", + # "CV" = "#bebddb") ) + #guides=guide_legend(reverse=TRUE) + annotation_custom(grob) + # doesn't work with plotly but looks nice :-(